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

jinpengyong

2021-06-23 df2f2b669f4196f599ca4db91917314ddc4ed94f

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

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