diff --git a/.idea/WMSV1.iml b/.idea/WMSV1.iml
index acd1d7a..9de5783 100644
--- a/.idea/WMSV1.iml
+++ b/.idea/WMSV1.iml
@@ -94,23 +94,19 @@
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
<orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.3.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.7.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.7" level="project" />
- <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.7" level="project" />
- <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.6" level="project" />
- <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.2" level="project" />
+ <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.12" level="project" />
+ <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.0.1" level="project" />
+ <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.0.1" level="project" />
+ <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.1" level="project" />
+ <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.12" level="project" />
+ <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.10" level="project" />
+ <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:2.0" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.17" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.1.17" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
- <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
- <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
+ <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.4.0" level="project" />
@@ -188,5 +184,15 @@
<orderEntry type="library" name="Maven: org.testng:testng:7.0.0-beta7" level="project" />
<orderEntry type="library" name="Maven: com.beust:jcommander:1.72" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.1.2" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.1.2" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.1.2" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.1.2" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.7.RELEASE" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.8" level="project" />
+ <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.1.2" level="project" />
+ <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.1" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_24.xml b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_24.xml
deleted file mode 100644
index 33fa8b1..0000000
--- a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_24.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Maven: com.github.jsqlparser:jsqlparser:1.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_64.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_64.xml
deleted file mode 100644
index 3724f84..0000000
--- a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_64.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Maven: com.github.pagehelper:pagehelper:5.1.6">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.6/pagehelper-5.1.6.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.6/pagehelper-5.1.6-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.6/pagehelper-5.1.6-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_74.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_74.xml
deleted file mode 100644
index 3caacd8..0000000
--- a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_74.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.7">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.7/pagehelper-spring-boot-autoconfigure-1.2.7.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.7/pagehelper-spring-boot-autoconfigure-1.2.7-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.7/pagehelper-spring-boot-autoconfigure-1.2.7-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_74.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_74.xml
deleted file mode 100644
index 3cd91a4..0000000
--- a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_74.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.7">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.7/pagehelper-spring-boot-starter-1.2.7.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.7/pagehelper-spring-boot-starter-1.2.7-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.7/pagehelper-spring-boot-starter-1.2.7-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml
deleted file mode 100644
index f46aa80..0000000
--- a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Maven: commons-fileupload:commons-fileupload:1.3.3">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_5.xml b/.idea/libraries/Maven__commons_io_commons_io_2_5.xml
deleted file mode 100644
index 67c2ad2..0000000
--- a/.idea/libraries/Maven__commons_io_commons_io_2_5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Maven: commons-io:commons-io:2.5">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.5/commons-io-2.5.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.5/commons-io-2.5-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.5/commons-io-2.5-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml
deleted file mode 100644
index 377b7a7..0000000
--- a/.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Maven: org.mybatis:mybatis:3.4.6">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.6/mybatis-3.4.6.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.6/mybatis-3.4.6-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.6/mybatis-3.4.6-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml
deleted file mode 100644
index 713f604..0000000
--- a/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Maven: org.mybatis:mybatis-spring:1.3.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.2/mybatis-spring-1.3.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.2/mybatis-spring-1.3.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.2/mybatis-spring-1.3.2-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_24.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_24.xml
deleted file mode 100644
index af2905f..0000000
--- a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_24.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.3.2/mybatis-spring-boot-autoconfigure-1.3.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.3.2/mybatis-spring-boot-autoconfigure-1.3.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.3.2/mybatis-spring-boot-autoconfigure-1.3.2-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_24.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_24.xml
deleted file mode 100644
index 6cce5e6..0000000
--- a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_24.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2">
- <CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.3.2/mybatis-spring-boot-starter-1.3.2.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.3.2/mybatis-spring-boot-starter-1.3.2-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.3.2/mybatis-spring-boot-starter-1.3.2-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5a7f134..ef7401f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,30 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="">
+ <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="用户查询修改">
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/controller/ZoneController.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/mapper/ZoneMapper.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/service/ZoneService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/WMSV1.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/WMSV1.iml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_pool_commons_pool_1_6.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__de_odysseus_juel_juel_api_2_2_7.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__de_odysseus_juel_juel_impl_2_2_7.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__de_odysseus_juel_juel_spi_2_2_7.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__joda_time_joda_time_2_9_9.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_bpmn_converter_6_0_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_bpmn_model_6_0_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_dmn_api_6_0_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_dmn_model_6_0_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_engine_6_0_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_form_api_6_0_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_form_model_6_0_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_image_generator_6_0_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_process_validation_6_0_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_spring_6_0_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_spring_boot_starter_basic_6_0_0.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_email_1_4.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_5_0_7_RELEASE.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_testng_testng_7_0_0_beta4.xml" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_24.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_64.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_74.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_74.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_5.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_24.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_24.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/classes/" />
<ignored path="$PROJECT_DIR$/target/" />
@@ -34,20 +26,239 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
+ <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/huaheng/pc/general/zone/domain/Zone.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1955">
+ <caret line="85" selection-start-line="85" selection-end-line="85" />
+ <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/huaheng/pc/system/user/mapper/UserRoleMapper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="207">
+ <caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/mapper/ZoneMapper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="115">
+ <caret line="5" column="39" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/controller/ZoneController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="404">
+ <caret line="22" column="20" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-sources.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="23">
+ <caret line="82" column="17" selection-start-line="82" selection-start-column="17" selection-end-line="82" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/service/ZoneService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="115">
+ <caret line="5" column="42" selection-start-line="5" selection-start-column="42" selection-end-line="5" selection-end-column="42" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-sources.jar!/com/baomidou/mybatisplus/extension/service/IService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="529">
+ <caret line="263" column="17" selection-start-line="263" selection-start-column="12" selection-end-line="263" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
+ </component>
+ <component name="FileTemplateManagerImpl">
+ <option name="RECENT_TEMPLATES">
+ <list>
+ <option value="Interface" />
+ <option value="Class" />
+ </list>
+ </option>
+ </component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+ <option name="RECENT_BRANCH_BY_REPOSITORY">
+ <map>
+ <entry key="$PROJECT_DIR$" value="developMain" />
+ </map>
+ </option>
+ </component>
+ <component name="IdeDocumentHistory">
+ <option name="CHANGED_PATHS">
+ <list>
+ <option value="$PROJECT_DIR$/src/main/resources/mybatis/system/UserMapper.xml" />
+ <option value="$PROJECT_DIR$/src/main/resources/templates/system/user/user.html" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/domain/Zone.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/mapper/ZoneMapper.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/service/ZoneService.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/controller/ZoneController.java" />
+ </list>
+ </option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
- <option name="x" value="140" />
- <option name="y" value="120" />
- <option name="width" value="1765" />
- <option name="height" value="735" />
+ <option name="x" value="-1928" />
+ <option name="y" value="-8" />
+ <option name="width" value="1936" />
+ <option name="height" value="1056" />
+ </component>
+ <component name="ProjectView">
+ <navigator proportions="" version="1">
+ <foldersAlwaysOnTop value="true" />
+ </navigator>
+ <panes>
+ <pane id="ProjectPane">
+ <subPane>
+ <expand>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ <item name="pc" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ <item name="pc" type="462c0819:PsiDirectoryNode" />
+ <item name="general" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ <item name="pc" type="462c0819:PsiDirectoryNode" />
+ <item name="general" type="462c0819:PsiDirectoryNode" />
+ <item name="zone" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="test" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="test" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="test" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com.huaheng.test" type="462c0819:PsiDirectoryNode" />
+ </path>
+ </expand>
+ <select />
+ </subPane>
+ </pane>
+ <pane id="Scope" />
+ <pane id="PackagesPane" />
+ </panes>
</component>
<component name="PropertiesComponent">
+ <property name="RequestMappingsPanelOrder0" value="0" />
+ <property name="RequestMappingsPanelOrder1" value="1" />
+ <property name="RequestMappingsPanelWidth0" value="75" />
+ <property name="RequestMappingsPanelWidth1" value="75" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+ <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1565075665688" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/../WMSV1" />
+ <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
@@ -61,7 +272,20 @@
</list>
</option>
</component>
- <component name="RunManager">
+ <component name="RunManager" selected="Application.CreateCode">
+ <configuration name="CreateCode" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+ <option name="MAIN_CLASS_NAME" value="com.huaheng.test.CreateCode" />
+ <module name="WMSV1" />
+ <extension name="coverage">
+ <pattern>
+ <option name="PATTERN" value="com.huaheng.test.*" />
+ <option name="ENABLED" value="true" />
+ </pattern>
+ </extension>
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
<configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="WMSV1" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
@@ -69,6 +293,11 @@
<option name="Make" enabled="true" />
</method>
</configuration>
+ <recent_temporary>
+ <list>
+ <item itemvalue="Application.CreateCode" />
+ </list>
+ </recent_temporary>
</component>
<component name="SvnConfiguration">
<configuration />
@@ -81,51 +310,315 @@
<option name="presentableId" value="Default" />
<updated>1563950700252</updated>
<workItem from="1563950701881" duration="73000" />
+ <workItem from="1565055472980" duration="7608000" />
</task>
+ <task id="LOCAL-00001" summary="用户查询修改">
+ <created>1565058322310</created>
+ <option name="number" value="00001" />
+ <option name="presentableId" value="LOCAL-00001" />
+ <option name="project" value="LOCAL" />
+ <updated>1565058322310</updated>
+ </task>
+ <option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="73000" />
+ <option name="totallyTimeSpent" value="7998000" />
</component>
<component name="ToolWindowManager">
- <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
+ <frame x="-1928" y="-8" width="1936" height="1056" extended-state="6" />
+ <editor active="true" />
<layout>
- <window_info id="Designer" />
- <window_info id="Image Layers" />
- <window_info id="UI Designer" />
- <window_info id="Favorites" side_tool="true" />
- <window_info id="Capture Tool" />
- <window_info id="Web" side_tool="true" />
- <window_info content_ui="combo" id="Project" order="0" weight="0.25" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1988273" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
- <window_info anchor="bottom" id="Spring" />
- <window_info anchor="bottom" id="Terminal" />
- <window_info anchor="bottom" id="Event Log" side_tool="true" />
- <window_info anchor="bottom" id="Messages" />
- <window_info anchor="bottom" id="Java Enterprise" />
- <window_info anchor="bottom" id="Database Changes" />
- <window_info anchor="bottom" id="Version Control" />
- <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
+ <window_info id="Designer" order="2" />
+ <window_info id="UI Designer" order="3" />
+ <window_info id="Favorites" order="4" side_tool="true" />
+ <window_info id="Capture Tool" order="5" />
+ <window_info id="Web" order="6" side_tool="true" />
+ <window_info id="Image Layers" order="7" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
- <window_info anchor="bottom" id="Run" order="2" />
- <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+ <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.329718" />
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.26030368" />
<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" />
- <window_info anchor="right" id="Maven" />
- <window_info anchor="right" id="Palette" />
- <window_info anchor="right" id="Capture Analysis" />
- <window_info anchor="right" id="Database" />
- <window_info anchor="right" id="Palette	" />
- <window_info anchor="right" id="Theme Preview" />
- <window_info anchor="right" id="Bean Validation" />
+ <window_info anchor="bottom" id="Spring" order="7" />
+ <window_info anchor="bottom" id="Terminal" order="8" />
+ <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
+ <window_info anchor="bottom" id="Java Enterprise" order="10" />
+ <window_info anchor="bottom" id="Database Changes" order="11" />
+ <window_info anchor="bottom" id="Version Control" order="12" weight="0.17895879" />
+ <window_info anchor="bottom" id="Docker" order="13" show_stripe_button="false" />
+ <window_info anchor="bottom" id="Messages" order="14" weight="0.3286119" />
+ <window_info anchor="right" id="BPMNPalette" />
<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" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+ <window_info anchor="right" id="Maven" order="3" />
+ <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" />
+ <window_info anchor="right" id="Palette	" order="7" />
+ <window_info anchor="right" id="Theme Preview" order="8" />
+ <window_info anchor="right" id="Bean Validation" order="9" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
+ <component name="Vcs.Log.Tabs.Properties">
+ <option name="TAB_STATES">
+ <map>
+ <entry key="MAIN">
+ <value>
+ <State>
+ <option name="RECENTLY_FILTERED_USER_GROUPS">
+ <collection />
+ </option>
+ <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+ <collection />
+ </option>
+ <option name="COLUMN_ORDER">
+ <list>
+ <option value="0" />
+ <option value="1" />
+ <option value="2" />
+ <option value="3" />
+ </list>
+ </option>
+ </State>
+ </value>
+ </entry>
+ </map>
+ </option>
+ </component>
+ <component name="VcsManagerConfiguration">
+ <MESSAGE value="用户查询修改" />
+ <option name="LAST_COMMIT_MESSAGE" value="用户查询修改" />
+ </component>
+ <component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="131">
+ <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pom.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="23">
+ <caret line="367" column="21" selection-start-line="367" selection-start-column="21" selection-end-line="367" selection-end-column="21" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/UserRole.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="177">
+ <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/general/CompanyMapper.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="120">
+ <caret line="49" column="2" selection-start-line="49" selection-start-column="2" selection-end-line="49" selection-end-column="2" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="407">
+ <caret line="63" column="44" selection-start-line="63" selection-start-column="44" selection-end-line="63" selection-end-column="44" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/user/user.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="79">
+ <caret line="41" column="70" selection-start-line="41" selection-start-column="70" selection-end-line="41" selection-end-column="70" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/domain/Warehouse.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-4830">
+ <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseServiceImpl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="92">
+ <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/UserCompany.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-84">
+ <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/role/domain/Role.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="276">
+ <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application-druid.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-313" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-1242" />
+ </provider>
+ </entry>
+ <entry file="jar://C:/Program Files (x86)/jdk1.9/src.zip!/java/util/Date.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="631">
+ <caret line="130" column="13" selection-start-line="130" selection-start-column="13" selection-end-line="130" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state>
+ <caret line="198" column="17" selection-start-line="198" selection-start-column="17" selection-end-line="198" selection-end-column="17" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-1716">
+ <caret line="159" column="36" selection-start-line="159" selection-start-column="36" selection-end-line="159" selection-end-column="36" />
+ <folding>
+ <element signature="e#5289#5290#0" expanded="true" />
+ <element signature="e#5343#5344#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="170">
+ <caret line="41" column="22" selection-start-line="41" selection-start-column="22" selection-end-line="41" selection-end-column="22" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/User.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-2338">
+ <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/system/UserMapper.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-4031">
+ <caret line="2" selection-start-line="2" selection-end-line="2" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/test/java/com.huaheng.test/CreateCode.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="23">
+ <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/mapper/UserMapper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-345">
+ <caret line="14" selection-start-line="14" selection-end-line="14" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/mapper/UserRoleMapper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="207">
+ <caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/domain/Zone.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1955">
+ <caret line="85" selection-start-line="85" selection-end-line="85" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/service/ZoneService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="115">
+ <caret line="5" column="42" selection-start-line="5" selection-start-column="42" selection-end-line="5" selection-end-column="42" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/com/baomidou/mybatisplus/extension/service/IService.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="138">
+ <caret line="22" column="17" selection-start-line="22" selection-start-column="17" selection-end-line="22" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="138">
+ <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-sources.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="23">
+ <caret line="82" column="17" selection-start-line="82" selection-start-column="17" selection-end-line="82" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-sources.jar!/com/baomidou/mybatisplus/extension/service/IService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="529">
+ <caret line="263" column="17" selection-start-line="263" selection-start-column="12" selection-end-line="263" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/mapper/ZoneMapper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="115">
+ <caret line="5" column="39" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/controller/ZoneController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="404">
+ <caret line="22" column="20" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </component>
</project>
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/general/zone/controller/ZoneController.java b/src/main/java/com/huaheng/pc/general/zone/controller/ZoneController.java
new file mode 100644
index 0000000..54836ef
--- /dev/null
+++ b/src/main/java/com/huaheng/pc/general/zone/controller/ZoneController.java
@@ -0,0 +1,15 @@
+package com.huaheng.pc.general.zone.controller;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.annotation.Resource;
+
+@Component
+@RequestMapping
+public class ZoneController {
+
+
+
+
+}