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

wuqiping

2021-06-09 f342a0d88b2a7168f794d0cf545d16a3138acb6d

 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;