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

jinpengyong

2023-11-10 4686da41b376617f6d447b3546c045ce54f032fa

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


}