From 25cc716bd7c5968aa11d6c9aaef6e0cd724b86ad Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期五, 01 九月 2023 11:56:00 +0800
Subject: [PATCH] 冲突
---
minipro_standard/pages.json | 21 ---------------------
1 files changed, 0 insertions(+), 21 deletions(-)
diff --git a/minipro_standard/pages.json b/minipro_standard/pages.json
index 58b5fa3..2b2d939 100644
--- a/minipro_standard/pages.json
+++ b/minipro_standard/pages.json
@@ -155,27 +155,6 @@
}
},
{
- "path": "pages/manualFeed/manualFeed",
- "style": {
- "navigationBarTitleText": "鎵嬪姩鎶曟枡",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/OrderDetail/OrderDetail",
- "style": {
- "navigationBarTitleText": "宸ュ崟璇︽儏",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/workOrderReporting/workOrderReporting",
- "style": {
- "navigationBarTitleText": "宸ュ崟鎶ュ伐",
- "enablePullDownRefresh": false
- }
- },
- {
"path": "pages/transferList/transferList",
"style": {
"navigationBarTitleText": "杞簱鍒楄〃",
--
Gitblit v1.9.3