diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 1c275036..4eab4347 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -700,7 +700,7 @@ public class TmTaskServiceImpl implements TmTaskService { } @Override - @Transactional + @Transactional(rollbackFor=Exception.class) public int edit(TmTask tmTask) { int flag = 0; int res = 0; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java index 0eda84b2..11ca3043 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java @@ -92,7 +92,7 @@ public class BackApplyController extends BaseController { /** * 退料申请详情--用于退料单,不带分页 */ - @ApiOperation(value = "退料申请(退料单、审批)") + @ApiOperation(value = "退料申请(退料单、驳回提交)") @GetMapping("/materialReturnNoteByApply") public AjaxResult materialReturnNoteByApply(BackApplyInfo bean) { bean.setFlag(1);