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

zc-business/src/main/resources/mapper/business/DcEventMapper.xml

@@ -258,6 +258,7 @@
                    WHEN '11' THEN '扫码报警'
                    WHEN '12' THEN '非机预警'
                    WHEN '13' THEN '气象检测器'
+                   WHEN '14' THEN '边坡监测'
                    ELSE '其他'
                    END              AS stringEventSource,
                event_nature,
@@ -505,6 +506,7 @@
                    WHEN '11' THEN '扫码报警'
                    WHEN '12' THEN '非机预警'
                    WHEN '13' THEN '气象检测器'
+                   WHEN '14' THEN '边坡监测'
                    ELSE '其他'
                    END                  AS stringEventSource,
                dc_event.event_nature,