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

lizijie

2021-05-25 aecc6316d0a6bcb3119dc062106deb5a57cdd790

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

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