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

cjl

2023-10-27 509c208bab15c3b125b5e3f8e6df141fb1d85acb

 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