Merge remote-tracking branch 'origin/dev_New' into dev_New

maven

8 小时以前 63328dd80adc6331db581dda6418308e6fd4da12

 src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java

@@ -39,6 +39,7 @@
    @PostMapping("/add")
    @ApiOperation("新增")
    public AjaxResult add(@RequestBody SealApplicationManagement sealApplicationManagement){
        sealApplicationManagementService.save(sealApplicationManagement);
        //消息通知
        sysNoticeService.simpleNoticeByUser("用印审批",
                "申请编号："+sealApplicationManagement.getApplicationNum()+"\n"
@@ -46,7 +47,7 @@
                Arrays.asList(sealApplicationManagement.getApproveUserId()),
                sealApplicationManagement.getTenantId(),
                "/collaborativeApproval/sealManagement?applicationNum="+sealApplicationManagement.getApplicationNum());
        return AjaxResult.success(sealApplicationManagementService.save(sealApplicationManagement));
        return AjaxResult.success();
    }

    @PostMapping("/update")