|
|
@@ -5,9 +5,7 @@
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="cb7b6a84-9179-4588-9374-31a70f785e65" name="Default Changelist" comment="">
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/vo/ApplysVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/ApplysVo.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartApplyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartApplyServiceImpl.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/SmartIdentityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/SmartIdentityMapper.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
|
@@ -40,100 +38,17 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartApplyController.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="230">
|
|
|
- <caret line="128" selection-start-line="128" selection-end-line="128" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartUserController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="58">
|
|
|
- <caret line="1846" column="45" selection-start-line="1846" selection-start-column="45" selection-end-line="1846" selection-end-column="45" />
|
|
|
- <folding>
|
|
|
- <element signature="method#importZipUsers#0;class#SmartUserController#0" />
|
|
|
- <element signature="e#44515#49821#1" />
|
|
|
- <element signature="e#49920#49944#0" />
|
|
|
- <element signature="e#50206#50223#0" />
|
|
|
- <element signature="e#52774#55331#1" />
|
|
|
- <element signature="e#55345#55362#0" />
|
|
|
- <element signature="method#updateSmartUserById#0;class#SmartUserController#0" />
|
|
|
- <element signature="e#63181#67302#1" />
|
|
|
- <element signature="e#67400#67417#0" />
|
|
|
- <element signature="method#queryPageSmartUser#0;class#SmartUserController#0" />
|
|
|
- <element signature="method#smartUserExport#0;class#SmartUserController#0" />
|
|
|
- <element signature="method#QueryDepartmentTreeRecords#0;class#SmartUserController#0" />
|
|
|
- <element signature="method#QueryParentDepartments#0;class#SmartUserController#0" />
|
|
|
- <element signature="method#deleteSmartUserById#0;class#SmartUserController#0" />
|
|
|
- <element signature="method#queryAffiliateUserById#0;class#SmartUserController#0" />
|
|
|
- <element signature="method#downloadUserExcel#0;class#SmartUserController#0" />
|
|
|
- <element signature="method#queryStudents#0;class#SmartUserController#0" />
|
|
|
- <element signature="method#queryInfoData#0;class#SmartUserController#0" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="299">
|
|
|
+ <caret line="134" column="84" selection-start-line="134" selection-start-column="61" selection-end-line="134" selection-end-column="84" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="430">
|
|
|
- <caret line="189" column="62" selection-start-line="189" selection-start-column="62" selection-end-line="189" selection-end-column="62" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/vo/ApplysVo.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="920">
|
|
|
- <caret line="40" column="27" selection-start-line="40" selection-start-column="27" selection-end-line="40" selection-end-column="27" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/SmartUserService.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="380">
|
|
|
- <caret line="66" column="13" selection-start-line="66" selection-start-column="4" selection-end-line="66" selection-end-column="13" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="334">
|
|
|
- <caret line="189" column="34" selection-start-line="189" selection-start-column="21" selection-end-line="189" selection-end-column="34" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/SmartUserControllerAPI.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="357">
|
|
|
- <caret line="124" column="60" selection-start-line="124" selection-start-column="60" selection-end-line="124" selection-end-column="60" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/bindStudentRequest.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartIdentityMapper.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="147">
|
|
|
- <caret line="31" column="9" selection-start-line="31" selection-start-column="9" selection-end-line="31" selection-end-column="9" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="300">
|
|
|
- <caret line="116" selection-start-line="116" selection-end-line="116" />
|
|
|
+ <state relative-caret-position="141">
|
|
|
+ <caret line="11" column="45" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -175,9 +90,9 @@
|
|
|
<find>queryPageSmartUser</find>
|
|
|
<find>affiliates</find>
|
|
|
<find>queryIdentityApplyById</find>
|
|
|
- <find>applys</find>
|
|
|
<find>"小程序</find>
|
|
|
<find>queryAppletApplys</find>
|
|
|
+ <find>applys</find>
|
|
|
<find>deleteSmartApplyById</find>
|
|
|
</findStrings>
|
|
|
<replaceStrings>
|
|
|
@@ -236,7 +151,6 @@
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartScoreController.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/AffiliateUserVo.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/SmartApply.java" />
|
|
|
- <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SmartIdentityMapper.xml" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/mapper/SmartIdentityMapper.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartIdentityServiceImpl.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/services/SmartIdentityService.java" />
|
|
|
@@ -253,6 +167,7 @@
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/ApplysVo.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartApplyServiceImpl.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/resources/mapper/template/SmartIdentityMapper.xml" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -283,7 +198,7 @@
|
|
|
<component name="MavenRunner">
|
|
|
<option name="skipTests" value="true" />
|
|
|
</component>
|
|
|
- <component name="ProjectFrameBounds" extendedState="6">
|
|
|
+ <component name="ProjectFrameBounds">
|
|
|
<option name="x" value="-7" />
|
|
|
<option name="width" value="958" />
|
|
|
<option name="height" value="1039" />
|
|
|
@@ -632,12 +547,12 @@
|
|
|
<workItem from="1705388695984" duration="51258000" />
|
|
|
<workItem from="1705885614332" duration="695000" />
|
|
|
<workItem from="1705886328968" duration="31068000" />
|
|
|
- <workItem from="1705992981607" duration="21524000" />
|
|
|
+ <workItem from="1705992981607" duration="21980000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="467550000" />
|
|
|
+ <option name="totallyTimeSpent" value="468006000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
|
|
|
@@ -651,7 +566,7 @@
|
|
|
<window_info id="Designer" order="5" />
|
|
|
<window_info id="Web" order="6" side_tool="true" />
|
|
|
<window_info id="Structure" order="7" side_tool="true" weight="0.25" />
|
|
|
- <window_info content_ui="combo" id="Project" order="8" weight="0.25906184" />
|
|
|
+ <window_info active="true" content_ui="combo" id="Project" order="8" visible="true" weight="0.123667374" />
|
|
|
<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.30196938" />
|
|
|
@@ -669,7 +584,7 @@
|
|
|
<window_info anchor="bottom" id="Version Control" order="14" />
|
|
|
<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="Maven" order="0" weight="0.8184855" />
|
|
|
+ <window_info anchor="right" id="Maven" order="0" weight="0.83964366" />
|
|
|
<window_info anchor="right" id="Palette" order="1" />
|
|
|
<window_info anchor="right" id="Capture Analysis" order="2" />
|
|
|
<window_info anchor="right" id="Database" order="3" weight="0.32942432" />
|
|
|
@@ -801,6 +716,12 @@
|
|
|
<properties />
|
|
|
<option name="timeStamp" value="113" />
|
|
|
</line-breakpoint>
|
|
|
+ <line-breakpoint enabled="true" type="java-line">
|
|
|
+ <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartApplyController.java</url>
|
|
|
+ <line>135</line>
|
|
|
+ <properties />
|
|
|
+ <option name="timeStamp" value="114" />
|
|
|
+ </line-breakpoint>
|
|
|
</breakpoints>
|
|
|
</breakpoint-manager>
|
|
|
</component>
|
|
|
@@ -971,13 +892,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartIdentityMapper.xml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="322">
|
|
|
- <caret line="14" column="39" selection-start-line="14" selection-start-column="16" selection-end-line="14" selection-end-column="39" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/template/mapper/SmartGradeMapper.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="299">
|
|
|
@@ -1072,13 +986,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartApplyController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="230">
|
|
|
- <caret line="128" selection-start-line="128" selection-end-line="128" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/impl/SmartUserServiceImpl.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="334">
|
|
|
@@ -1185,11 +1092,25 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartIdentityController.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="430">
|
|
|
+ <state relative-caret-position="361">
|
|
|
<caret line="189" column="62" selection-start-line="189" selection-start-column="62" selection-end-line="189" selection-end-column="62" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SmartApplyController.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="299">
|
|
|
+ <caret line="134" column="84" selection-start-line="134" selection-start-column="61" selection-end-line="134" selection-end-column="84" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/SmartIdentityMapper.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="141">
|
|
|
+ <caret line="11" column="45" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
</component>
|
|
|
<component name="masterDetails">
|
|
|
<states>
|