Merge remote-tracking branch 'origin/cjl' into dev

cjl

2024-04-18 67a5f2c9689d38b5b1533888829b7f9bbf0c3ba8

 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;
    }


}