Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -268,8 +268,8 @@
         <where>
             <include refid="listWhereForPage"></include>
         </where>
-        group by IC_RESI_USER.id
         <if test="null != groupByTables and groupByTables.size() > 0">
+            group by IC_RESI_USER.id
             <foreach item="groupTableName" collection="groupByTables" open="," separator="," close="">
                 ${groupTableName}.ID
             </foreach>