update

ERMCP/PCWEB/Menu/pc_menu_ermcp_v6.json

@@ -1,5 +1,4 @@
 [
-<<<<<<< HEAD
 	{
         "title": "底部单据菜单",
         "rulekey": "client_pc_web_market",
@@ -23,8 +22,6 @@
             }
         ]
     },
-=======
->>>>>>> 717efa9ced3fe1243a661b97836f2d9de1e8c8e3
     {
         "title": "市场",
         "rulekey": "client_pc_web_market",