|
|
@@ -2,17 +2,7 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="">
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/api/RepairUserControllerAPI.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairUserController.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairCollaborateRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/RepairCollaborateRecordService.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairCollaborateRecordServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairCollaborateRecordServiceImpl.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" 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/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/target/classes/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application-dev.yml" afterDir="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/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.yml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" 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" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/out/" />
|
|
|
@@ -46,94 +36,19 @@
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <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="407">
|
|
|
- <caret line="1765" column="96" selection-start-line="1765" selection-start-column="88" selection-end-line="1765" selection-end-column="96" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/SmsConfig.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="295">
|
|
|
- <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/WxOpenidConfig.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="701">
|
|
|
- <caret line="41" column="27" selection-start-line="41" selection-start-column="19" selection-end-line="41" selection-end-column="27" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/MySecurity.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="138">
|
|
|
- <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/MyBatisPlusConfig.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="28">
|
|
|
- <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/handler/MyMetaObjectHandler.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="23">
|
|
|
- <caret line="17" column="15" selection-start-line="17" selection-start-column="15" selection-end-line="17" selection-end-column="15" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="200">
|
|
|
- <caret line="296" lean-forward="true" selection-start-line="296" selection-end-line="296" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairAdminService.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="437">
|
|
|
- <caret line="24" column="37" selection-start-line="24" selection-start-column="16" selection-end-line="24" selection-end-column="37" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairAdminServiceImpl.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-632">
|
|
|
- <caret line="56" column="44" selection-start-line="56" selection-start-column="23" selection-end-line="56" selection-end-column="44" />
|
|
|
+ <state relative-caret-position="338">
|
|
|
+ <caret line="76" column="73" selection-start-line="76" selection-start-column="12" selection-end-line="76" selection-end-column="73" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <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/RepairAdminController.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-7">
|
|
|
- <caret line="74" selection-start-line="74" selection-end-line="74" />
|
|
|
+ <state relative-caret-position="913">
|
|
|
+ <caret line="96" column="73" selection-start-line="96" selection-start-column="73" selection-end-line="96" selection-end-column="73" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -150,8 +65,6 @@
|
|
|
</component>
|
|
|
<component name="FindInProjectRecents">
|
|
|
<findStrings>
|
|
|
- <find>weixin</find>
|
|
|
- <find>@Pass</find>
|
|
|
<find>金额不一致</find>
|
|
|
<find>setScale</find>
|
|
|
<find>周一</find>
|
|
|
@@ -175,11 +88,13 @@
|
|
|
<find>queryPageCollaborator</find>
|
|
|
<find>queryCollaboratorUser</find>
|
|
|
<find>getRepairByAccount</find>
|
|
|
- <find>insertRepairAdmin</find>
|
|
|
<find>Register</find>
|
|
|
<find>getRepairByCardnumber</find>
|
|
|
<find>填充</find>
|
|
|
+ <find>user</find>
|
|
|
<find>head</find>
|
|
|
+ <find>insertRepairAdmin</find>
|
|
|
+ <find>updateRepairAdmin</find>
|
|
|
</findStrings>
|
|
|
<replaceStrings>
|
|
|
<replace>repairConsumables</replace>
|
|
|
@@ -236,7 +151,6 @@
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/repair/model/vo/TrackDetailsVo.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairAdminServiceImpl.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/repair/services/RepairAdminService.java" />
|
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/repair/model/request/updateUserDataRequest.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairClassesSettingsController.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairConsumeController.java" />
|
|
|
@@ -271,6 +185,7 @@
|
|
|
<option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
|
|
|
<option value="$PROJECT_DIR$/src/main/resources/application-prod.yml" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -302,7 +217,7 @@
|
|
|
<component name="MavenRunner">
|
|
|
<option name="skipTests" value="true" />
|
|
|
</component>
|
|
|
- <component name="ProjectFrameBounds" extendedState="6">
|
|
|
+ <component name="ProjectFrameBounds" extendedState="7">
|
|
|
<option name="x" value="-7" />
|
|
|
<option name="width" value="958" />
|
|
|
<option name="height" value="1039" />
|
|
|
@@ -742,12 +657,12 @@
|
|
|
<workItem from="1695273589677" duration="7033000" />
|
|
|
<workItem from="1695342790191" duration="1226000" />
|
|
|
<workItem from="1695621473813" duration="357000" />
|
|
|
- <workItem from="1695628762126" duration="2747000" />
|
|
|
+ <workItem from="1695628762126" duration="3945000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="1097028000" />
|
|
|
+ <option name="totallyTimeSpent" value="1098226000" />
|
|
|
</component>
|
|
|
<component name="TodoView">
|
|
|
<todo-panel id="selected-file">
|
|
|
@@ -759,7 +674,7 @@
|
|
|
</todo-panel>
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
- <frame x="-8" y="-8" width="1936" height="1048" extended-state="7" />
|
|
|
+ <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
|
|
|
<editor active="true" />
|
|
|
<layout>
|
|
|
<window_info id="Designer" order="0" />
|
|
|
@@ -771,10 +686,10 @@
|
|
|
<window_info id="Ant Build" order="6" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
|
|
|
<window_info id="Favorites" order="7" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
|
|
|
<window_info id="Web" order="8" sideWeight="0.50547045" side_tool="true" weight="0.13219616" />
|
|
|
- <window_info active="true" content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.18923241" />
|
|
|
+ <window_info content_ui="combo" id="Project" order="9" sideWeight="0.5021882" visible="true" weight="0.34135666" />
|
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
|
<window_info anchor="bottom" id="Find" order="1" weight="0.32603937" />
|
|
|
- <window_info anchor="bottom" id="Run" order="2" weight="0.5295405" />
|
|
|
+ <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.5348066" />
|
|
|
<window_info anchor="bottom" id="Event Log" order="3" weight="0.32822758" />
|
|
|
<window_info anchor="bottom" id="Debug" order="4" weight="0.1487965" />
|
|
|
<window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
|
|
|
@@ -791,7 +706,7 @@
|
|
|
<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" content_ui="combo" id="Hierarchy" order="1" weight="0.25" />
|
|
|
- <window_info anchor="right" id="Maven" order="2" weight="0.5698294" />
|
|
|
+ <window_info anchor="right" id="Maven" order="2" weight="0.7253829" />
|
|
|
<window_info anchor="right" id="Palette" order="3" />
|
|
|
<window_info anchor="right" id="Capture Analysis" order="4" />
|
|
|
<window_info anchor="right" id="Database" order="5" weight="0.32889125" />
|
|
|
@@ -1200,13 +1115,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairAdmin.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="111">
|
|
|
- <caret line="50" lean-forward="true" selection-start-line="50" selection-end-line="50" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/repair/api/LoginControllerAPI.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="161">
|
|
|
@@ -1238,27 +1146,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-7">
|
|
|
- <caret line="74" selection-start-line="74" selection-end-line="74" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairAdminService.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="437">
|
|
|
- <caret line="24" column="37" selection-start-line="24" selection-start-column="16" selection-end-line="24" selection-end-column="37" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairAdminServiceImpl.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-632">
|
|
|
- <caret line="56" column="44" selection-start-line="56" selection-start-column="23" selection-end-line="56" selection-end-column="44" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/repair/config/SmsConfig.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="295">
|
|
|
@@ -1294,6 +1181,13 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="1074">
|
|
|
+ <caret line="292" column="44" selection-start-line="292" selection-start-column="36" selection-end-line="292" selection-end-column="44" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<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="407">
|
|
|
@@ -1304,10 +1198,31 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/LoginController.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/RepairAdminService.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="437">
|
|
|
+ <caret line="24" column="37" selection-start-line="24" selection-start-column="16" selection-end-line="24" selection-end-column="37" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/model/pojo/RepairAdmin.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="157">
|
|
|
+ <caret line="31" column="13" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/services/impl/RepairAdminServiceImpl.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="338">
|
|
|
+ <caret line="76" column="73" selection-start-line="76" selection-start-column="12" selection-end-line="76" selection-end-column="73" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/repair/controller/RepairAdminController.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="200">
|
|
|
- <caret line="296" lean-forward="true" selection-start-line="296" selection-end-line="296" />
|
|
|
+ <state relative-caret-position="913">
|
|
|
+ <caret line="96" column="73" selection-start-line="96" selection-start-column="73" selection-end-line="96" selection-end-column="73" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|