多次并板

zwl

2025-09-01 03afa45e6fcab6329025e3492d2665d6632e9be8

 .idea/workspace.xml

@@ -5,23 +5,7 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="ac5e0bc2-a4ad-4c6e-9ad6-80e4dd8ec177" name="Changes" comment="修复并板功能">
      <change beforePath="$PROJECT_DIR$/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/manifest.json" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/pages/pakin/WarehousePickOutParallelBoard.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/pakin/WarehousePickOutParallelBoard.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/certdata" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/certdata" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__DA5854D/__uniappquill.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__DA5854D/__uniappquill.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__DA5854D/app-config-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__DA5854D/app-config-service.js" 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/cache/wgt/__UNI__DA5854D/view.umd.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/cache/wgt/__UNI__DA5854D/view.umd.min.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/unpackage/dist/build/app-plus/__uniappquill.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/build/app-plus/__uniappquill.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-config-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/build/app-plus/app-config-service.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" />
      <change beforePath="$PROJECT_DIR$/unpackage/dist/build/app-plus/view.umd.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/unpackage/dist/build/app-plus/view.umd.min.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/unpackage/release/apk/__UNI__DA5854D__20240910082202.apk" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -138,7 +122,7 @@
                  <entry key="branch">
                    <value>
                      <list>
                        <option value="nbncPda" />
                        <option value="origin/nbncPda" />
                      </list>
                    </value>
                  </entry>