Merge remote-tracking branch 'origin/dev_bugfix_ljj'

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

@@ -384,7 +384,7 @@
         WHERE del_flag = '0'
         and ABANDON_FLAG='0'
         AND pid = #{agencyId}
-        ORDER BY created_time DESC
+        ORDER BY sort asc,created_time asc
     </select>
 
     <select id="selectGridListByIds" resultType="com.epmet.dto.CustomerGridDTO">