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

cjl

2023-08-09 83e42707519f5e2d886618ea55c30e8c3ab381ac

 screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationUpdateForm.java

@@ -67,9 +67,9 @@
                        ObjectUtils.isEmpty(areaCode) &&
                        ObjectUtils.isEmpty(locationLevelCode) &&
                        ObjectUtils.isEmpty(address) &&
                        ObjectUtils.isEmpty(phone) &&
                        ObjectUtils.isEmpty(email) &&
                        ObjectUtils.isEmpty(wechat) &&
                        phone==null &&
                        email==null &&
                        wechat==null &&
                        ObjectUtils.isEmpty(expireTime)
                )
            return false;