Merge branch 'cjl' into dev

cjl

2025-01-06 27e6bc3df3e39e0d0b147b155a89ad6837ea972b

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

@@ -56,8 +56,8 @@
    @GetMapping("check")
    @ApiOperation("审批")
    public ResultMessage check(@RequestParam @ApiParam(value = "id",name = "主键id") Integer id,
                                       @RequestParam @ApiParam(value = "sate",name = "状态") Integer sate){
        allocationExtensionService.check(id,sate);
                                       @RequestParam @ApiParam(value = "state",name = "状态") Integer state){
        allocationExtensionService.check(id,state);
        return ResultMessage.ok();
    }