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

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

@@ -36,7 +36,7 @@
         <result property="dimension" column="dimension"/>
         <result property="longitude" column="longitude"/>
         <result property="linkId" column="link_id"/>
-        <result property="eventSubclas" column="event_subclas"/>
+        <result property="eventSubclassName" column="event_subclass_name"/>
     </resultMap>
 
     <resultMap type="map" id="countMap">
@@ -167,7 +167,7 @@
                longitude,
                dimension,
                event_title,
-               event_subclass as event_subclas,
+               event_subclass as event_subclass,
                link_id,
                is_perceived,
                CASE event_type
@@ -237,7 +237,7 @@
                    WHEN '10-8' THEN '路面积水'
                    WHEN '10-9' THEN '其他'
                    WHEN '11-1' THEN '其他事件'
-                   END              AS event_subclass,
+                   END              AS event_subclass_name,
                event_cause,
                description,
                dc_event.event_state,
@@ -408,7 +408,7 @@
                dc_event.event_title,
                dc_event.occurrence_time,
                dc_event.event_type      AS event_type,
-               dc_event.event_subclass AS event_subclas,
+               dc_event.event_subclass AS event_subclass,
                CASE dc_event.event_type
                    WHEN '1' THEN '交通事故'
                    WHEN '2' THEN '车辆故障'
@@ -476,7 +476,7 @@
                    WHEN '10-8' THEN '路面积水'
                    WHEN '10-9' THEN '其他'
                    WHEN '11-1' THEN '其他事件'
-                   END                  AS event_subclass,
+                   END                  AS event_subclass_name,
                dc_event.event_subclass  AS subclass,
                dc_event.event_cause,
                dc_event.description,