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

cjl

2023-08-30 2e0bf4423c235802791012e1fb0817d2c9156b2a

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


}