From e39d47402ab026d591a2e4f3c62521589a6de151 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 30 七月 2025 14:20:10 +0800
Subject: [PATCH] 修复并板功能
---
.idea/workspace.xml | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e9ac300..7273940 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,18 +4,7 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
- <list default="true" id="ac5e0bc2-a4ad-4c6e-9ad6-80e4dd8ec177" name="Changes" comment="淇鍐嶅苟鏉垮姛鑳�">
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/pages/order/orderPickConfirm2.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/order/orderPickConfirm2.vue" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/pages/pakin/WarehouseOutMergeBoardMany.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/pakin/WarehouseOutMergeBoardMany.vue" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/unpackage/cache/apk/__UNI__DA5854D_cm.apk" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/apk/__UNI__DA5854D_cm.apk" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/unpackage/cache/apk/apkurl" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/apk/apkurl" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/unpackage/cache/apk/cmManifestCache.json" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/apk/cmManifestCache.json" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__DA5854D/app-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__DA5854D/app-service.js" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__DA5854D/app-view.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__DA5854D/app-view.js" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-service.js" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-view.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-view.js" afterDir="false" />
- </list>
+ <list default="true" id="ac5e0bc2-a4ad-4c6e-9ad6-80e4dd8ec177" name="Changes" comment="淇骞舵澘鍔熻兘" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -88,6 +77,7 @@
<workItem from="1751445845425" duration="609000" />
<workItem from="1751587586718" duration="2476000" />
<workItem from="1753749990661" duration="8601000" />
+ <workItem from="1753852801143" duration="1361000" />
</task>
<task id="LOCAL-00001" summary="#">
<option name="closed" value="true" />
@@ -105,7 +95,15 @@
<option name="project" value="LOCAL" />
<updated>1753752133650</updated>
</task>
- <option name="localTasksCounter" value="3" />
+ <task id="LOCAL-00003" summary="淇骞舵澘鍔熻兘">
+ <option name="closed" value="true" />
+ <created>1753852824211</created>
+ <option name="number" value="00003" />
+ <option name="presentableId" value="LOCAL-00003" />
+ <option name="project" value="LOCAL" />
+ <updated>1753852824211</updated>
+ </task>
+ <option name="localTasksCounter" value="4" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -137,6 +135,7 @@
<component name="VcsManagerConfiguration">
<MESSAGE value="#" />
<MESSAGE value="淇鍐嶅苟鏉垮姛鑳�" />
- <option name="LAST_COMMIT_MESSAGE" value="淇鍐嶅苟鏉垮姛鑳�" />
+ <MESSAGE value="淇骞舵澘鍔熻兘" />
+ <option name="LAST_COMMIT_MESSAGE" value="淇骞舵澘鍔熻兘" />
</component>
</project>
\ No newline at end of file
--
Gitblit v1.9.1