Merge remote-tracking branch 'origin/dev_ic_platform' into develop

4 years ago · f650184189
1 changed files with 1 additions and 0 deletions
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@ -702,5 +702,6 @@
        on(cg.PID=ca.id and ca.DEL_FLAG='0')
        where cg.DEL_FLAG='0'
          and cg.PIDS like concat(#{gridPids},'%')
+         order by ca.CREATED_TIME asc,cg.CREATED_TIME asc
    </select>
 </mapper>