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

jinpengyong

2022-01-17 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3

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

@@ -61,12 +61,10 @@
    /*
    * 版本拥有的因子
    * */
    @TableField(exist = false)
    private List<Sensor> sensors;


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


}