Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-10-27 f86b4032c5824c4e69821ce9b795e8a7c236c799

 screen-api/src/main/java/com/moral/api/entity/MonitorPoint.java

@@ -100,9 +100,6 @@
    private List<Device> devices;


    @Override
    protected Serializable pkVal() {
        return this.id;
    }


}