shoplist修改

2022-05-17 18:23:38 +08:00
parent d874010de2
commit 996517797f
1 changed files with 0 additions and 4 deletions
--- a/shared/resource/jsons/dic_zyz_shopList.json
+++ b/shared/resource/jsons/dic_zyz_shopList.json
@@ -37,11 +37,7 @@
        "shopicon": "shoptubiaozi_shizhuang",
        "typeid": "7&12",
        "moneyid": "40006&40014",
-<<<<<<< Updated upstream
-        "openLimit": "20&"
-=======
        "openLimit": "5&"
->>>>>>> Stashed changes
    },
    {
        "shopid": 6,