Merge branch 'dev_resi_export' into develop

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

@@ -120,8 +120,6 @@
             </if>
             AND a.DEL_FLAG = '0'
         </where>
-#         order by a.CREATED_TIME, a.BUILDING_NAME
-        #排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序
         ORDER BY CONVERT(b.NEIGHBOR_HOOD_NAME using gbk),
         CONVERT(a.BUILDING_NAME USING gbk)
     </select>

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

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