Merge remote-tracking branch 'origin/master'

zhangherong

2 天以前 182c04e399f5db26406234767f7ef34b5adc0015

 src/main/java/org/jeecg/modules/mes/controller/MesWorkReportingController.java

@@ -29,7 +29,7 @@
*/
@Api(tags="工单报工")
@RestController
@RequestMapping("/mesworkreporting/mesWorkReporting")
@RequestMapping("/mes/mesWorkReporting")
@Slf4j
public class MesWorkReportingController extends JeecgController<MesWorkReporting, IMesWorkReportingService> {
   @Autowired
@@ -63,13 +63,13 @@
    * @param mesWorkReporting
    * @return
    */
   @AutoLog(value = "工单报工-添加")
   @ApiOperation(value="工单报工-添加", notes="工单报工-添加")
   @AutoLog(value = "工单报工-新增报工")
   @ApiOperation(value="工单报工-新增报工", notes="工单报工-新增报工")
   //@RequiresPermissions("org.jeecg.modules:mes_work_reporting:add")
   @PostMapping(value = "/add")
   public Result<String> add(@RequestBody MesWorkReporting mesWorkReporting) {
       mesWorkReportingService.save(mesWorkReporting);
       return Result.OK("添加成功！");
   public Result<MesWorkReporting> add(@RequestBody MesWorkReporting mesWorkReporting) {
       MesWorkReporting workReporting = mesWorkReportingService.addReporting(mesWorkReporting);
       return Result.OK("添加成功！", workReporting);
   }

   /**