From e9ae77e42ca35e30de229663a72ca899aaf9046e Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 30 五月 2025 14:28:54 +0800
Subject: [PATCH] 123

---
 manifest.json |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/manifest.json b/manifest.json
index 65dca18..8230155 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,12 +2,8 @@
     "name" : "涓壃WMS",
     "appid" : "__UNI__DA5854D",
     "description" : "",
-<<<<<<< HEAD
-    "versionName" : "20250108A",
-=======
-    "versionName" : "20241128A",
->>>>>>> 248ef3ba3de9994dc83d2b36690542893f9fb6e6
-    "versionCode" : 136,
+    "versionName" : "20250530A",
+    "versionCode" : 146,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {

--
Gitblit v1.9.1