Merge remote-tracking branch 'origin/master'

src/main/java/com/gaotao/modules/sys/controller/SysMenuController.java

@@ -250,4 +250,7 @@ public class SysMenuController extends AbstractController {
 		 }
 		return R.error("添加语言失败");
 	}
+
+
+
 }

src/main/java/com/gaotao/modules/sys/controller/SysUserController.java

@@ -174,4 +174,18 @@ public class SysUserController extends AbstractController {
 		sysUserService.updateUserLanguageDefault(user);
 		return R.ok();
 	}
+
+	/**
+	 * 修改状态
+	 * @param user
+	 * @return
+	 */
+	@PostMapping("updateUserStatus")
+	public R updateUserStatus(@RequestBody SysUserEntity user){
+		SysUserEntity user1 = getUser();
+		System.out.println(user1);
+
+		sysUserService.update(user);
+		return R.ok();
+	}
 }

src/main/java/com/gaotao/modules/sys/entity/SysUserEntity.java

@@ -51,8 +51,6 @@ public class SysUserEntity implements Serializable {
 	/**
 	 * 邮箱
 	 */
-	@NotBlank(message="邮箱不能为空", groups = {AddGroup.class, UpdateGroup.class})
-	@Email(message="邮箱格式不正确", groups = {AddGroup.class, UpdateGroup.class})
 	private String email;
 
 	/**
@@ -86,6 +84,19 @@ public class SysUserEntity implements Serializable {
 	 */
 	private Long site;
 
+	/**
+	 * 用户昵称
+	 */
+	private String userDisplay;
+
+	public String getUserDisplay() {
+		return userDisplay;
+	}
+
+	public void setUserDisplay(String userDisplay) {
+		this.userDisplay = userDisplay;
+	}
+
 	public Long getSite() {
 		return site;
 	}

src/main/java/com/gaotao/modules/sys/service/SysMenuService.java

@@ -59,4 +59,5 @@ public interface SysMenuService extends IService<SysMenuEntity> {
     List<SysObjectLanguageMenu> searchMenuLanguageById(SysObjectLanguageMenu sysObjectLanguageMenu);
 
 	Boolean saveMenuLanguage(SysObjectLanguageMenu sysObjectLanguageMenu);
+
 }

src/main/java/com/gaotao/modules/sys/service/impl/SysMenuServiceImpl.java

@@ -142,4 +142,8 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuDao, SysMenuEntity> i
 
 		return sysObjectLanguageMenuService.saveSysObjectLanguageMenu(sysObjectLanguageMenu);
 	}
+
+
+
+
 }