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

cjl

2023-07-24 7a734de6f72aa43cccddf74083ac134e41d1afff

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

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


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


}