Merge remote-tracking branch 'origin/master'

zss

2024-06-26 f6e7379fbfbba4f6667944a2be62f99461bf97f0

 performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java

@@ -47,7 +47,7 @@
    }

    @ValueClassify("工时管理")
    //@ApiOperation(value = "统计产量工时汇总和辅助工时汇总")
    @ApiOperation(value = "统计产量工时汇总和辅助工时汇总")
    @PostMapping("/collectWorkingHours")
    public Result collectWorkingHours(){
      return Result.success(auxiliaryOutputWorkingHoursService.collectWorkingHours());