Merge branch 'system-zyj' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysUserMapper.java

@@ -151,7 +151,7 @@ public interface SysUserMapper extends CrudMapper<SysUser> {
                                      @Param("userId") long userId);
 
     public List<SysUser> userList(@Param("tenantId") Integer tenantId,
-                                  @Param("createBy") String createBy);
+                                  @Param("userName") String userName);
 
     SysUser selectUserData(@Param("userName") String userName,
                            @Param("tenantId") Integer tenantId);

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysUserMapper.xml

@@ -289,8 +289,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="tenantId != null and tenantId != 0">
 			and tenant_id = #{tenantId}
 		</if>
-		<if test="createBy != null and createBy != ''">
-			and create_by = #{createBy}
+		<if test="userName != null and userName != ''">
+			and user_name = #{userName}
 		</if>
 		order by user_id desc
 	</select>