修改代码

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -987,11 +987,13 @@ public class ExcelServiceImpl {
 				String[] tempCity = item.getNativePlace().split("@");
 				firefighters.setNativePlaceValue(tempCity[0]);
 				firefighters.setNativePlace(tempCity[1]);
+				firefighters.setNativePlaceCode(tempCity[1]);
 			}
 			if (item.getResidenceDetails() != null) {
 				String[] tempCity = item.getResidenceDetails().split("@");
 				firefighters.setResidence(tempCity[0]);
 				firefighters.setResidenceDetails(tempCity[1]);
+				firefighters.setResidenceDetailsCode(tempCity[1]);
 			}
 
 

amos-boot-system-equip/src/main/resources/mapper/VideoMapper.xml

@@ -535,13 +535,13 @@
         <if test="par.buildingId!=null and par.buildingId!=''">
             SELECT
             v.id AS id,
-            v.name AS name,
-            v.token AS token,
-            v.url AS url,
             v.code AS code,
+            v.url AS url,
+            v.token AS token,
+            v.name AS name,
             v.address,
-            '' as distance,
             v.longitude,
+            '' as distance,
             v.latitude
             FROM wl_video v
             JOIN wl_video_source vc ON vc.video_id = v.id
@@ -744,10 +744,7 @@
     </select>
 
     <sql id="videoField">
-        wlv
-        .
-        id
-        ,
+        wlv.id,
         wlv.code,
         wlv.name,
         wlv.address,