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

cjl

2023-11-22 319fdcaa2d7979b056b2801e11d08fe6ecdff126

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

@@ -92,9 +92,4 @@
    private String desc;


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

}