Merge branch 'master' of http://111.61.77.35:9999/gengdidi/precision-effect

precision-effect-admin/src/main/java/com/zehong/web/controller/system/SysNoticeController.java

@@ -85,7 +85,7 @@ public class SysNoticeController extends BaseController
     /**
      * 修改通知公告
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
+//    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
     @Log(title = "通知公告", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysNotice notice)

precision-effect-system/src/main/java/com/zehong/system/domain/TTransactionProject.java

@@ -52,7 +52,7 @@ public class TTransactionProject extends BaseEntity
     private BigDecimal price;
 
     /** 部门 */
-    @Excel(name = "部门：103泽宏云研发部，104泽宏云技术部，105泽宏云销售部，200核算部，201综合管理部，202销售服务部")
+    @Excel(name = "部门编号")
     private Long deptId;
 
     @Excel(name = "单位")