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

liyong

6 天以前 fe82da7485601580104c058f382405cc0cc9e043

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

@@ -34,7 +34,7 @@
     */
    @PostMapping("/add")
    public AjaxResult add(@RequestBody NoticeType noticeType) {
        return AjaxResult.success(noticeTypeService.save(noticeType));
        return AjaxResult.success(noticeTypeService.saveOrUpdate(noticeType));
    }

    /**