Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/Configuration

ERMCP/PCWEB/Menu/pc_menu_ermcp_v6.json

@@ -1,4 +1,5 @@
 [
+<<<<<<< HEAD
 	{
         "title": "底部单据菜单",
         "rulekey": "client_pc_web_market",
@@ -22,6 +23,8 @@
             }
         ]
     },
+=======
+>>>>>>> 717efa9ced3fe1243a661b97836f2d9de1e8c8e3
     {
         "title": "市场",
         "rulekey": "client_pc_web_market",
@@ -767,7 +770,7 @@
                         "auth": [
                             {
                                 "label": "修改",
-                                "rulekey": "",
+                                "rulekey": "audit_setting_edit",
                                 "code": "edit",
                                 "isshow": true,
                                 "remark": ""