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

cjl

2023-10-10 9699bc8502d9bffd382a27fb4156bb777bce4453

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

@@ -22,7 +22,7 @@
@Slf4j
@RestController
@RequestMapping("/log")
@Api(tags = "日志")
@Api(tags = "日志管理")
public class LogController {

    @Autowired