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

cjl

2023-11-08 5c1d58556e9cd4c7603b5e16dc1640f61623af0b

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

@@ -38,15 +38,6 @@
    UserDTO updateUser(UserUpdateForm form);

    /**
    * @Description: 删除组织的admin用户
            * @Param: [form]
            * @return: com.moral.api.pojo.dto.user.UserDTO
            * @Author: 陈凯裕
            * @Date: 2021/5/20
            */
    UserDTO deleteUser(UserDeleteForm form);

    /**
    * @Description: 插入组织的admin用户
            * @Param: [form]
            * @return: com.moral.api.pojo.dto.user.UserDTO