Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-05-13 e05adb8da62b72798fe273454d51bb36b2ee72de

 screen-manage/src/main/java/com/moral/api/service/impl/UserServiceImpl.java

@@ -281,7 +281,7 @@
        deleteUserGroupWrapper.eq("organization_id",organizationId);
        deleteUserGroupWrapper.set("is_delete", Constants.DELETE);
        userGroupMapper.update(null,deleteUserGroupWrapper);
        //逻辑删除，group
        //逻辑删除，groupMenu
        UpdateWrapper deleteGroupWrapper = new UpdateWrapper();
        deleteGroupWrapper.eq("organization_id",organizationId);
        deleteGroupWrapper.set("is_delete", Constants.DELETE);