From fcd7ece15a86fc0cb526ee801ff8262b0db22dee Mon Sep 17 00:00:00 2001
From: NNowhZzU <1539353356@qq.com>
Date: 星期一, 25 十二月 2023 11:40:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/.idea/workspace.xml |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/north-glass-erp/.idea/workspace.xml b/north-glass-erp/.idea/workspace.xml
index bdc9935..559c132 100644
--- a/north-glass-erp/.idea/workspace.xml
+++ b/north-glass-erp/.idea/workspace.xml
@@ -56,7 +56,7 @@
     &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
     &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
     &quot;git-widget-placeholder&quot;: &quot;master&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/EPR-Refactoring/north-glass-erp&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/GitRepository/ERP_override/north-glass-erp/northglass-erp/src/components/pp/processCard&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
     &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
@@ -82,11 +82,11 @@
       <recent name="com.example.erp.config" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\GitRepository\ERP_override\north-glass-erp\northglass-erp\src\components\pp\processCard" />
+      <recent name="D:\GitRepository\ERP_override\north-glass-erp\northglass-erp\src\components\pp\workorder" />
+      <recent name="D:\GitRepository\ERP_override\north-glass-erp\northglass-erp\src\views\pp\workOrder" />
       <recent name="D:\Documents\north-glass-erp\src\main\resources\mapper\userInfo" />
       <recent name="D:\projct\document\north-glass-erp\src\main\java\com\example\erp\service\userInfo" />
-      <recent name="D:\projct\document\north-glass-erp\src\main\java\com\example\erp\mapper" />
-      <recent name="D:\projct\document\north-glass-erp\src\main\java\com\example\erp\entity" />
-      <recent name="D:\Documents\north-glass-erp\northglass-erp\public" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="D:\EPR-Refactoring\north-glass-erp\northglass-erp\src\views" />
@@ -104,7 +104,7 @@
       <command value="length" />
     </option>
   </component>
-  <component name="RunManager" selected="Spring Boot.ErpApplication">
+  <component name="RunManager" selected="npm.dev">
     <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
       <option name="arquillianRunConfiguration">
         <value>
@@ -211,7 +211,8 @@
       <workItem from="1702426354510" duration="34981000" />
       <workItem from="1702631535326" duration="205000" />
       <workItem from="1702858329054" duration="9016000" />
-      <workItem from="1703031064839" duration="6501000" />
+      <workItem from="1703031064839" duration="55055000" />
+      <workItem from="1703463546867" duration="1756000" />
     </task>
     <task id="LOCAL-00001" summary="绗竴娆℃帹閫�">
       <option name="closed" value="true" />

--
Gitblit v1.8.0