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

cjl

2023-10-19 2a4a9ef52b0d76efb9712fd8d4268f658546f99f

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

@@ -65,9 +65,6 @@
    private List<Sensor> sensors;


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


}