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

mahuandong
2 parents cfb55e9c d25dd7bf
Showing 3 changed files with 11 additions and 0 deletions
pom.xml
src/main/resources/mybatis/system/UserMapper.xml
src/main/resources/templates/system/user/user.html
@@ -372,6 +372,11 @@
 			<version>${lombok.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-annotation</artifactId>
+			<version>3.1.2</version>
+		</dependency>
 	</dependencies>
  
 	<build>
@@ -49,6 +49,9 @@
         <if test="loginName != null and loginName != ''">
             AND u.loginName like concat('%', #{loginName}, '%')
         </if>
+		<if test="userName != null and userName != ''">
+			AND u.userName like concat('%', #{userName}, '%')
+		</if>
         <if test="enable != null">
             AND u.enable = #{enable}
         </if>
@@ -39,6 +39,9 @@
 								登录名称：<input type="text" name="loginName"/>
 							</li>
 							<li>
+								用户名称：<input type="text" name="userName"/>
+							</li>
+							<li>
 								手机号码：<input type="text" name="phoneNumber"/>
 							</li>
 							<li>