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

jinpengyong

2021-05-27 d666793c93e91026e129f00bae414217690635ae

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

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