Merge remote-tracking branch 'origin/dev_abandon_grid' into dev_abandon_grid

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

@@ -342,7 +342,6 @@
         WHERE cg.del_flag = '0'
         AND ca.del_flag = '0'
         AND cg.SYNC_FLAG='1'
-        and cg.ABANDON_FLAG='0'
         AND cg.id IN
         <foreach item="id" collection="gridIdList" open="(" separator="," close=")">
             #{id}