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

kaiyu

2021-05-20 4e07b25ea19699bd34c6ab146432c4348fd68806

 screen-api/src/main/java/com/moral/api/controller/UserController.java

@@ -26,7 +26,7 @@
import com.moral.util.PageResult;

@Slf4j
@Api(tags = {"用户"})
@Api(tags = {"用户管理"})
@RestController
@RequestMapping("/user")
public class UserController {