工程文件

DESKTOP-AO0VKC8\mahua
1 parent d1ef6cd1
Showing 2 changed files with 9 additions and 15 deletions
.idea/modules.xml
.idea/workspace.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/wms2.iml" filepath="$PROJECT_DIR$/.idea/wms2.iml" />
-    </modules>
-  </component>
-</project>
 \ No newline at end of file
@@ -19,9 +19,7 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="差异单样式修改">
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html" afterDir="false" />
-    </list>
+    <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="合并信义源码" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -100,7 +98,7 @@
     <property name="node.js.path.for.package.tslint" value="project" />
     <property name="node.js.selected.package.eslint" value="(autodetect)" />
     <property name="node.js.selected.package.tslint" value="(autodetect)" />
-    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+    <property name="settings.editor.selected.configurable" value="preferences.fileTypes" />
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
@@ -303,10 +301,14 @@
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="696" y="221" key="RollbackChangesDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890072970" />
-    <state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1594890222057">
+    <state x="461" y="164" key="SettingsEditor" timestamp="1594946753286">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="552" y="253" key="Vcs.Push.Dialog.v2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890222057" />
+    <state x="461" y="164" key="SettingsEditor/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594946753286" />
+    <state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1594946725336">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="552" y="253" key="Vcs.Push.Dialog.v2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594946725336" />
     <state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
     <state x="742" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1594890018298" />
     <state x="742" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1594890018298" />
@@ -322,7 +324,7 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java</url>
-          <line>462</line>
+          <line>459</line>
           <option name="timeStamp" value="41" />
         </line-breakpoint>
       </breakpoints>