Merge remote-tracking branch 'origin/master'

zhsq_qk-system/src/main/resources/mapper/system/SysCameraMapper.xml

@@ -42,8 +42,8 @@
         a.latitude,
         a.build_type,
         case
-        when a.build_type = 1 then '小区建设'
-        when a.build_type = 2 then '路面建设'
+        when a.build_type = 3860 then '小区内部'
+        when a.build_type = 877 then '街道路面'
         when a.build_type = 3 then '已有'
         end buildTypeName
         FROM

zhsq_qk-ui/src/api/components/supermap.js

@@ -26,8 +26,8 @@ export const iconList={
 
 export function getIcon (state) {
   switch (state) {
-    case "1" : return iconList.lmjs;break;
-    case "2" : return iconList.xqjs;break;
+    case "877" : return iconList.lmjs;break;
+    case "3860" : return iconList.xqjs;break;
     case "3" : return iconList.yy;break;
   }
 }