Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-07-13 91a88471d84246524548a318aec1f22735cfedc9

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

@@ -43,7 +43,7 @@
    /**
     * 因子code
     */
    private Integer sensorCode;
    private String sensorCode;

    /**
     * 因子接收的单位