Merge branch 'dev_resi_export' into develop

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml

@@ -120,8 +120,8 @@
             </if>
             AND a.DEL_FLAG = '0'
         </where>
-        ORDER BY CONVERT(b.NEIGHBOR_HOOD_NAME using gbk),
-        CONVERT(a.BUILDING_NAME USING gbk)
+        ORDER BY CAST(b.NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(b.NEIGHBOR_HOOD_NAME using gbk),
+        CAST(a.BUILDING_NAME AS SIGNED),CONVERT(a.BUILDING_NAME USING gbk)
     </select>
     <select id="searchAllBuilding" resultType="com.epmet.excel.IcBuildingExcel">
         select

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml

@@ -143,7 +143,7 @@
             AND a.DEL_FLAG = '0'
 
         </where>
-        ORDER BY CONVERT(a.NEIGHBOR_HOOD_NAME using gbk)
+        ORDER BY CAST(a.NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(a.NEIGHBOR_HOOD_NAME using gbk)
     </select>
     <select id="searchAllNeighborhood" resultType="com.epmet.excel.IcNeighborHoodExcel">
         select