|
@@ -4,6 +4,8 @@
|
|
|
<list default="true" id="dd929402-2229-45b9-b0b5-26b38816b73a" name="Default" comment="">
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_civiladministration.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_civiladministration.java" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_healthcommission.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_healthcommission.java" afterDir="false" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/sooka-auth/target/" />
|
|
|
<ignored path="$PROJECT_DIR$/sooka-common/target/" />
|
|
@@ -37,11 +39,38 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
- <file leaf-file-name="Guiji_Housingconstruction.java" pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java">
|
|
|
+ <file leaf-file-name="Guiji_civiladministration.java" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_civiladministration.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="457">
|
|
|
- <caret line="160" column="38" selection-start-line="160" selection-start-column="38" selection-end-line="160" selection-end-column="38" />
|
|
|
+ <state relative-caret-position="330">
|
|
|
+ <caret line="36" column="46" lean-forward="true" selection-start-line="35" selection-start-column="11" selection-end-line="36" selection-end-column="46" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="Guiji_healthcommission.java" pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_healthcommission.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="510">
|
|
|
+ <caret line="109" column="46" selection-start-line="109" selection-start-column="46" selection-end-line="109" selection-end-column="46" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/application.yml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="360">
|
|
|
+ <caret line="12" column="4" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="application-dev.yml" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/application-dev.yml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="-269">
|
|
|
+ <caret line="90" column="19" selection-start-line="90" selection-start-column="19" selection-end-line="90" selection-end-column="19" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -125,7 +154,6 @@
|
|
|
<option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/Guiji_healthcommission_Service.java" />
|
|
|
<option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_healthcommission_yyryxx_Bean.java" />
|
|
|
<option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_healthcommission_tjxx_Bean.java" />
|
|
|
- <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_healthcommission.java" />
|
|
|
<option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_civiladministration_szxxsj_Bean.java" />
|
|
|
<option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api_pagefile/db.txt" />
|
|
|
<option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api_pagefile/application-dev-172.17.5.4.yml" />
|
|
@@ -137,7 +165,6 @@
|
|
|
<option value="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_Healthcommission_Mapper2.xml" />
|
|
|
<option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_healthcommission_ServiceImpl.java" />
|
|
|
<option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/Guiji_civiladministration_Service.java" />
|
|
|
- <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_civiladministration.java" />
|
|
|
<option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/base/BaseApi.java" />
|
|
|
<option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_civiladministration_ServiceImpl.java" />
|
|
|
<option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/mapper/Guiji_Housingconstruction_Mapper.java" />
|
|
@@ -156,7 +183,9 @@
|
|
|
<option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_naturalresources_ServiceImpl.java" />
|
|
|
<option value="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper.xml" />
|
|
|
<option value="$PROJECT_DIR$/test-api/src/main/resources/mapper/Guiji_naturalresources_Mapper2.xml" />
|
|
|
+ <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_civiladministration.java" />
|
|
|
<option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java" />
|
|
|
+ <option value="$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_healthcommission.java" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
@@ -534,7 +563,7 @@
|
|
|
<workItem from="1632445032397" duration="10654000" />
|
|
|
<workItem from="1632617293039" duration="876000" />
|
|
|
<workItem from="1632813327613" duration="6917000" />
|
|
|
- <workItem from="1633921285535" duration="225000" />
|
|
|
+ <workItem from="1633921285535" duration="2124000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="1">
|
|
|
<created>1627002165670</created>
|
|
@@ -690,11 +719,25 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1632824288926</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="23" />
|
|
|
+ <task id="LOCAL-00023" summary="1">
|
|
|
+ <created>1633921559184</created>
|
|
|
+ <option name="number" value="00023" />
|
|
|
+ <option name="presentableId" value="LOCAL-00023" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1633921559184</updated>
|
|
|
+ </task>
|
|
|
+ <task id="LOCAL-00024" summary="1">
|
|
|
+ <created>1633921646604</created>
|
|
|
+ <option name="number" value="00024" />
|
|
|
+ <option name="presentableId" value="LOCAL-00024" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1633921646604</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="25" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="287333000" />
|
|
|
+ <option name="totallyTimeSpent" value="289232000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -887,13 +930,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_civiladministration.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="159">
|
|
|
- <caret line="29" column="30" selection-start-line="29" selection-start-column="30" selection-end-line="29" selection-end-column="30" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/Guiji_civiladministration_Service.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="240">
|
|
@@ -1006,13 +1042,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_healthcommission.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="330">
|
|
|
- <caret line="96" column="17" lean-forward="true" selection-start-line="96" selection-start-column="17" selection-end-line="96" selection-end-column="17" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_housingconstruction_yhjjxx_Bean.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="930">
|
|
@@ -1027,20 +1056,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_Housingconstruction_ServiceImpl.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="360">
|
|
|
- <caret line="34" column="45" lean-forward="true" selection-start-line="32" selection-start-column="12" selection-end-line="34" selection-end-column="45" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/application.yml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="360">
|
|
|
- <caret line="12" column="4" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/model/bo/Guiji_naturalresources_bdcdjxx_Bean.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="3600">
|
|
@@ -1069,13 +1084,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/application-dev.yml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="2700">
|
|
|
- <caret line="90" column="19" selection-start-line="90" selection-start-column="19" selection-end-line="90" selection-end-column="19" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/mapper/Guiji_naturalresources_Mapper2.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="240">
|
|
@@ -1118,10 +1126,45 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/application-dev.yml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="-269">
|
|
|
+ <caret line="90" column="19" selection-start-line="90" selection-start-column="19" selection-end-line="90" selection-end-column="19" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/test-api/src/main/resources/application.yml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="360">
|
|
|
+ <caret line="12" column="4" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/service/impl/Guiji_Housingconstruction_ServiceImpl.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="-90">
|
|
|
+ <caret line="100" column="23" selection-start-line="100" selection-start-column="23" selection-end-line="100" selection-end-column="23" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_Housingconstruction.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="457">
|
|
|
- <caret line="160" column="38" selection-start-line="160" selection-start-column="38" selection-end-line="160" selection-end-column="38" />
|
|
|
+ <state relative-caret-position="-1597">
|
|
|
+ <caret line="104" column="44" selection-start-line="104" selection-start-column="44" selection-end-line="104" selection-end-column="44" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_civiladministration.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="330">
|
|
|
+ <caret line="36" column="46" lean-forward="true" selection-start-line="35" selection-start-column="11" selection-end-line="36" selection-end-column="46" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/test-api/src/main/java/com/sooka/api/Guiji_healthcommission.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="510">
|
|
|
+ <caret line="109" column="46" selection-start-line="109" selection-start-column="46" selection-end-line="109" selection-end-column="46" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|