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

jinpengyong

2022-03-09 5fa4c1db3141099be4ca176cdf2f3ec10f46c141

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


}