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

jinpengyong

2023-08-23 b1bfa089b5b299c1c3c71094e450748a5e5e8a75

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


}