diff --git a/configs/ItemMergeConfig.json b/configs/ItemMergeConfig.json
index 22b0ab8..9340f0d 100644
--- a/configs/ItemMergeConfig.json
+++ b/configs/ItemMergeConfig.json
@@ -2481,7 +2481,7 @@
           { "id": 845, "type": 0, "count": 10000 },
           { "id": 4, "type": 4, "count": 1000000 }
         ],
-        "mergelimit": { "office": 23, "circle": 15 },
+        "mergelimit": { "office": 23, "zs": 15 },
         "limitTips": "转生15且5珠亲王以上方可兑换"
       }
     },
diff --git a/configs/ShopConfig.json b/configs/ShopConfig.json
index 820d866..3869748 100644
--- a/configs/ShopConfig.json
+++ b/configs/ShopConfig.json
@@ -214,7 +214,7 @@
                 "shoptype": 1,
                 "Tabshop": 1,
                 "shop": {
-                    "id": 1242,
+                    "id": 1394,
                     "type": 0,
                     "count": 1
                 },
@@ -223,19 +223,19 @@
                     {
                         "limit": [
                             {
-                                "value": 0,
+                                "value": 15,
                                 "times": 1
                             }
                         ],
-                        "type": 3
+                        "type": 2
                     }
                 ],
                 "daylimit": 0,
                 "levellimit": 1,
                 "price": {
-                    "id": 3,
-                    "type": 3,
-                    "count": 188
+                    "id":4,
+                    "type": 4,
+                    "count": 1000000
                 }
             }
         },