From 06b00a178d194d33370e44410c4f04a4164f86c7 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 24 Jun 2021 14:07:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java
index ae3cfe8..238e94d 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java
@@ -33,7 +33,6 @@
private String wechat;
- private List<Integer> roleIds;
public boolean valid() {
if (ObjectUtils.isEmpty(accountId))
@@ -43,8 +42,7 @@
ObjectUtils.isEmpty(password) &&
ObjectUtils.isEmpty(email) &&
ObjectUtils.isEmpty(mobile) &&
- ObjectUtils.isEmpty(wechat) &&
- null == roleIds
+ ObjectUtils.isEmpty(wechat)
)
return false;
return true;
--
Gitblit v1.8.0