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

lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml

@@ -110,8 +110,8 @@
 
     <select id="selectUserList" parameterType="User" resultMap="UserResult">
         select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex,
-        u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.type, d.dept_name, u.law_certificate_num,
-        d.leader,u.tenant_code,t.tenant_code, t.tenant_name, t.contact_man, t.contact_number, t.address,u.certificateNumber
+        u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.type, d.dept_name, u.law_certificate_num,u.certificateNumber,
+        d.leader,u.tenant_code,t.tenant_code, t.tenant_name, t.contact_man, t.contact_number, t.address
         from sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
         left join sys_tenant t on t.tenant_code = u.tenant_code
@@ -152,7 +152,6 @@
         <if test="tenantCode != @com.zdxt.auth.common.constant.Constants@DEFAULT_TENANT_CODE and tenantCode != null and tenantCode != ''">
             AND u.tenant_code = #{tenantCode}
         </if>
-        group by u.law_certificate_num
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>