From 2ce4792824c3c85faa5137df546953fc0ba8e5fc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 05 一月 2024 15:31:32 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/.idea/workspace.xml | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/.idea/workspace.xml b/north-glass-erp/.idea/workspace.xml
index a01039c..9f8d10d 100644
--- a/north-glass-erp/.idea/workspace.xml
+++ b/north-glass-erp/.idea/workspace.xml
@@ -4,7 +4,25 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
- <list default="true" id="402214ec-6c93-4a9d-b589-f17dc90f718e" name="鏇存敼" comment="11.24鎻愪氦" />
+ <list default="true" id="402214ec-6c93-4a9d-b589-f17dc90f718e" name="鏇存敼" comment="11.24鎻愪氦">
+ <change afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/testSort.vue" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/northglass-erp/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/package-lock.json" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/northglass-erp/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/package.json" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/northglass-erp/src/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/router/index.js" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/customer/SelectCustomer.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/customer/SelectCustomer.vue" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/delivery/SelectDelivery.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/delivery/SelectDelivery.vue" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/delivery/SelectOrderList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/delivery/SelectOrderList.vue" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/order/SelectOrder.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/order/SelectOrder.vue" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/Product.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/Product.vue" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/Test.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/product/Test.vue" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/returns/SelectDeliveryList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/returns/SelectDeliveryList.vue" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/northglass-erp/src/views/sd/returns/SelectReturns.vue" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/src/views/sd/returns/SelectReturns.vue" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/northglass-erp/vite.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/northglass-erp/vite.config.js" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.yml" afterDir="false" />
+ </list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -67,7 +85,7 @@
"project.structure.side.proportion": "0.0",
"settings.editor.selected.configurable": "preferences.pluginManager",
"spring.configuration.checksum": "def6d90e829e50c63f98c387daecd138",
- "ts.external.directory.path": "D:\\杞欢\\IntelliJ IDEA 2023.2\\plugins\\javascript-impl\\jsLanguageServicesImpl\\external",
+ "ts.external.directory.path": "D:\\file\\IntelliJ IDEA 2023.2.1\\plugins\\javascript-impl\\jsLanguageServicesImpl\\external",
"vue.rearranger.settings.migration": "true"
},
"keyToStringList": {
@@ -104,7 +122,7 @@
<command value="length" />
</option>
</component>
- <component name="RunManager" selected="npm.dev">
+ <component name="RunManager" selected="Spring Boot.ErpApplication">
<configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
<option name="arquillianRunConfiguration">
<value>
@@ -212,9 +230,8 @@
<workItem from="1702631535326" duration="205000" />
<workItem from="1702858329054" duration="9016000" />
<workItem from="1703031064839" duration="55055000" />
- <workItem from="1703463546867" duration="21185000" />
- <workItem from="1704156530617" duration="3579000" />
- <workItem from="1704326593184" duration="11706000" />
+ <workItem from="1703463546867" duration="16447000" />
+ <workItem from="1703811064202" duration="29032000" />
</task>
<task id="LOCAL-00001" summary="绗竴娆℃帹閫�">
<option name="closed" value="true" />
@@ -375,6 +392,29 @@
<MESSAGE value="11.24鎻愪氦" />
<option name="LAST_COMMIT_MESSAGE" value="11.24鎻愪氦" />
</component>
+ <component name="XDebuggerManager">
+ <breakpoint-manager>
+ <breakpoints>
+ <line-breakpoint enabled="true" type="javascript">
+ <url>file://$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue</url>
+ <line>38</line>
+ <option name="timeStamp" value="4" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" type="javascript">
+ <url>file://$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue</url>
+ <line>254</line>
+ <properties lambdaOrdinal="-1" />
+ <option name="timeStamp" value="7" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" type="javascript">
+ <url>file://$PROJECT_DIR$/northglass-erp/src/views/sd/product/SelectProduct.vue</url>
+ <line>179</line>
+ <properties lambdaOrdinal="-1" />
+ <option name="timeStamp" value="8" />
+ </line-breakpoint>
+ </breakpoints>
+ </breakpoint-manager>
+ </component>
<component name="XSLT-Support.FileAssociations.UIState">
<expand />
<select />
--
Gitblit v1.8.0