|
|
@@ -2,11 +2,10 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="1da94ed8-6954-4dbc-8f54-8617863a9948" name="Default Changelist" comment="">
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/resources/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-prod.yml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/mapper/repair/RepairUserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/repair/RepairUserMapper.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/target/maven-archiver/pom.properties" beforeDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" beforeDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/target/classes/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application-prod.yml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/repair_system-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/target/surefire-reports/TEST-com.repair.MybatisPlusApplicationTests.xml" beforeDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/target/surefire-reports/TEST-com.repair.WrapperTest.xml" beforeDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/target/surefire-reports/com.repair.MybatisPlusApplicationTests.txt" beforeDir="false" />
|
|
|
@@ -22,11 +21,11 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="260">
|
|
|
- <caret line="413" column="79" selection-start-line="413" selection-start-column="63" selection-end-line="413" selection-end-column="79" />
|
|
|
+ <state relative-caret-position="237">
|
|
|
+ <caret line="337" column="115" selection-start-line="337" selection-start-column="115" selection-end-line="337" selection-end-column="115" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -34,8 +33,8 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="302">
|
|
|
- <caret line="241" column="297" selection-start-line="241" selection-start-column="297" selection-end-line="241" selection-end-column="297" />
|
|
|
+ <state relative-caret-position="5681">
|
|
|
+ <caret line="247" column="153" selection-start-line="247" selection-start-column="133" selection-end-line="247" selection-end-column="153" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -43,8 +42,8 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="828">
|
|
|
- <caret line="43" column="90" selection-start-line="43" selection-start-column="82" selection-end-line="43" selection-end-column="90" />
|
|
|
+ <state relative-caret-position="276">
|
|
|
+ <caret line="19" column="11" selection-start-line="19" selection-start-column="11" selection-end-line="19" selection-end-column="11" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -59,20 +58,10 @@
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="345">
|
|
|
- <caret line="15" column="51" selection-start-line="15" selection-start-column="51" selection-end-line="15" selection-end-column="51" />
|
|
|
+ <state relative-caret-position="322">
|
|
|
+ <caret line="14" column="29" selection-start-line="14" selection-start-column="29" selection-end-line="14" selection-end-column="29" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -85,9 +74,9 @@
|
|
|
<find>dropDown</find>
|
|
|
<find>GROUP_CONCAT(id)</find>
|
|
|
<find>queryUserData</find>
|
|
|
- <find>提交报修</find>
|
|
|
<find>article_id or parent_id</find>
|
|
|
<find>autoDispatchUser</find>
|
|
|
+ <find>提交报修</find>
|
|
|
</findStrings>
|
|
|
</component>
|
|
|
<component name="Git.Settings">
|
|
|
@@ -98,6 +87,7 @@
|
|
|
<list>
|
|
|
<option value="$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml" />
|
|
|
<option value="$PROJECT_DIR$/src/main/resources/application-prod.yml" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -126,9 +116,12 @@
|
|
|
<select />
|
|
|
</treeState>
|
|
|
</component>
|
|
|
- <component name="ProjectFrameBounds">
|
|
|
+ <component name="MavenRunner">
|
|
|
+ <option name="skipTests" value="true" />
|
|
|
+ </component>
|
|
|
+ <component name="ProjectFrameBounds" extendedState="7">
|
|
|
<option name="x" value="-7" />
|
|
|
- <option name="width" value="974" />
|
|
|
+ <option name="width" value="958" />
|
|
|
<option name="height" value="1039" />
|
|
|
</component>
|
|
|
<component name="ProjectView">
|
|
|
@@ -136,7 +129,6 @@
|
|
|
<foldersAlwaysOnTop value="true" />
|
|
|
</navigator>
|
|
|
<panes>
|
|
|
- <pane id="PackagesPane" />
|
|
|
<pane id="Scope" />
|
|
|
<pane id="ProjectPane">
|
|
|
<subPane>
|
|
|
@@ -227,6 +219,7 @@
|
|
|
<select />
|
|
|
</subPane>
|
|
|
</pane>
|
|
|
+ <pane id="PackagesPane" />
|
|
|
</panes>
|
|
|
</component>
|
|
|
<component name="PropertiesComponent">
|
|
|
@@ -276,18 +269,19 @@
|
|
|
<option name="presentableId" value="Default" />
|
|
|
<updated>1699930738930</updated>
|
|
|
<workItem from="1699930740107" duration="3326000" />
|
|
|
- <workItem from="1699937034046" duration="1778000" />
|
|
|
+ <workItem from="1699937034046" duration="4324000" />
|
|
|
+ <workItem from="1699945990060" duration="1243000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="5104000" />
|
|
|
+ <option name="totallyTimeSpent" value="8893000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
- <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
|
|
|
+ <frame x="-8" y="-8" width="1936" height="1048" extended-state="7" />
|
|
|
<editor active="true" />
|
|
|
<layout>
|
|
|
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18708971" />
|
|
|
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.08742005" />
|
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
|
<window_info id="Designer" order="2" />
|
|
|
<window_info id="JRebel" order="3" side_tool="true" />
|
|
|
@@ -298,8 +292,8 @@
|
|
|
<window_info id="Web" order="8" side_tool="true" />
|
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
|
<window_info anchor="bottom" id="Find" order="1" />
|
|
|
- <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.33038673" />
|
|
|
- <window_info anchor="bottom" id="Debug" order="3" weight="0.6563536" />
|
|
|
+ <window_info anchor="bottom" id="Run" order="2" weight="0.32932165" />
|
|
|
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.64972377" />
|
|
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
|
@@ -314,9 +308,9 @@
|
|
|
<window_info anchor="bottom" id="JRebel Executor" order="15" />
|
|
|
<window_info anchor="bottom" id="JRebel Console" order="16" side_tool="true" />
|
|
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
|
- <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
|
+ <window_info anchor="right" id="Ant Build" order="1" weight="0.24945295" />
|
|
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
|
- <window_info anchor="right" id="Maven" order="3" weight="0.6203501" />
|
|
|
+ <window_info anchor="right" id="Maven" order="3" weight="0.7866521" />
|
|
|
<window_info anchor="right" id="Palette" order="4" />
|
|
|
<window_info anchor="right" id="Capture Analysis" order="5" />
|
|
|
<window_info anchor="right" id="Database" order="6" />
|
|
|
@@ -334,18 +328,35 @@
|
|
|
<breakpoints>
|
|
|
<line-breakpoint enabled="true" type="java-line">
|
|
|
<url>file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java</url>
|
|
|
- <line>1664</line>
|
|
|
+ <line>1659</line>
|
|
|
<properties />
|
|
|
<option name="timeStamp" value="4" />
|
|
|
</line-breakpoint>
|
|
|
</breakpoints>
|
|
|
</breakpoint-manager>
|
|
|
</component>
|
|
|
+ <component name="antWorkspaceConfiguration">
|
|
|
+ <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
|
|
|
+ <option name="FILTER_TARGETS" value="false" />
|
|
|
+ </component>
|
|
|
<component name="editorHistoryManager">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="5681">
|
|
|
+ <caret line="247" column="153" selection-start-line="247" selection-start-column="133" selection-end-line="247" selection-end-column="153" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/repair/mapper/RepairUserMapper.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="828">
|
|
|
- <caret line="43" column="90" selection-start-line="43" selection-start-column="82" selection-end-line="43" selection-end-column="90" />
|
|
|
+ <state relative-caret-position="276">
|
|
|
+ <caret line="19" column="11" selection-start-line="19" selection-start-column="11" selection-end-line="19" selection-end-column="11" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -356,30 +367,20 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
|
|
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="260">
|
|
|
- <caret line="413" column="79" selection-start-line="413" selection-start-column="63" selection-end-line="413" selection-end-column="79" />
|
|
|
+ <state relative-caret-position="322">
|
|
|
+ <caret line="14" column="29" selection-start-line="14" selection-start-column="29" selection-end-line="14" selection-end-column="29" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/repair/RepairUserMapper.xml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="302">
|
|
|
- <caret line="241" column="297" selection-start-line="241" selection-start-column="297" selection-end-line="241" selection-end-column="297" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
+ <entry file="file://$PROJECT_DIR$/../../../fsdownload/nohup.out">
|
|
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairRecordController.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="345">
|
|
|
- <caret line="15" column="51" selection-start-line="15" selection-start-column="51" selection-end-line="15" selection-end-column="51" />
|
|
|
+ <state relative-caret-position="237">
|
|
|
+ <caret line="337" column="115" selection-start-line="337" selection-start-column="115" selection-end-line="337" selection-end-column="115" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|