wms / sanyizhongka · Commits

Commit 49be3a04a06842f0c11ad469f8e1a060bc8f2ae6

Authored by mahuandong
2 parents 95b0600e 4648843d

Merge remote-tracking branch 'origin/develop' into develop

Inline Side-by-side
Showing 13 changed files with 582 additions and 198 deletions
.idea/WMSV1.iml
  View file @49be3a0
@@ -94,23 +94,19 @@ @@ -94,23 +94,19 @@
94 <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" /> 94 <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
95 <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" /> 95 <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
96 <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" /> 96 <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.6.1" level="project" />
97 - <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />  
98 - <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.3.RELEASE" level="project" />  
99 - <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />  
100 - <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.7.RELEASE" level="project" />  
101 - <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2" level="project" />  
102 - <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />  
103 - <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />  
104 - <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.7" level="project" />  
105 - <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.7" level="project" />  
106 - <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.6" level="project" />  
107 - <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.2" level="project" /> 97 + <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.12" level="project" />
  98 + <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.0.1" level="project" />
  99 + <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.0.1" level="project" />
  100 + <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.1" level="project" />
  101 + <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.12" level="project" />
  102 + <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.10" level="project" />
  103 + <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:2.0" level="project" />
108 <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.17" level="project" /> 104 <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.17" level="project" />
109 <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.17" level="project" /> 105 <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.17" level="project" />
110 <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> 106 <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
111 <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" /> 107 <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
112 - <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />  
113 - <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" /> 108 + <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
  109 + <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
114 <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.4.0" level="project" /> 110 <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.4.0" level="project" />
115 <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.4.0" level="project" /> 111 <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.4.0" level="project" />
116 <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.4.0" level="project" /> 112 <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.4.0" level="project" />
@@ -188,5 +184,15 @@ @@ -188,5 +184,15 @@
188 <orderEntry type="library" name="Maven: org.testng:testng:7.0.0-beta7" level="project" /> 184 <orderEntry type="library" name="Maven: org.testng:testng:7.0.0-beta7" level="project" />
189 <orderEntry type="library" name="Maven: com.beust:jcommander:1.72" level="project" /> 185 <orderEntry type="library" name="Maven: com.beust:jcommander:1.72" level="project" />
190 <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" /> 186 <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
  187 + <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.1.2" level="project" />
  188 + <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.1.2" level="project" />
  189 + <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.1.2" level="project" />
  190 + <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.1.2" level="project" />
  191 + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.0.3.RELEASE" level="project" />
  192 + <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.7.9" level="project" />
  193 + <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.0.7.RELEASE" level="project" />
  194 + <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.8" level="project" />
  195 + <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.1.2" level="project" />
  196 + <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.1" level="project" />
191 </component> 197 </component>
192 </module> 198 </module>
193 \ No newline at end of file 199 \ No newline at end of file
.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_24.xml deleted
View file @95b0600
1 -<component name="libraryTable">  
2 - <library name="Maven: com.github.jsqlparser:jsqlparser:1.2">  
3 - <CLASSES>  
4 - <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2.jar!/" />  
5 - </CLASSES>  
6 - <JAVADOC>  
7 - <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2-javadoc.jar!/" />  
8 - </JAVADOC>  
9 - <SOURCES>  
10 - <root url="jar://$MAVEN_REPOSITORY$/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2-sources.jar!/" />  
11 - </SOURCES>  
12 - </library>  
13 -</component>  
14 \ No newline at end of file 0 \ No newline at end of file
.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_64.xml deleted
View file @95b0600
1 -<component name="libraryTable">  
2 - <library name="Maven: com.github.pagehelper:pagehelper:5.1.6">  
3 - <CLASSES>  
4 - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.6/pagehelper-5.1.6.jar!/" />  
5 - </CLASSES>  
6 - <JAVADOC>  
7 - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.6/pagehelper-5.1.6-javadoc.jar!/" />  
8 - </JAVADOC>  
9 - <SOURCES>  
10 - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper/5.1.6/pagehelper-5.1.6-sources.jar!/" />  
11 - </SOURCES>  
12 - </library>  
13 -</component>  
14 \ No newline at end of file 0 \ No newline at end of file
.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_74.xml deleted
View file @95b0600
1 -<component name="libraryTable">  
2 - <library name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.7">  
3 - <CLASSES>  
4 - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.7/pagehelper-spring-boot-autoconfigure-1.2.7.jar!/" />  
5 - </CLASSES>  
6 - <JAVADOC>  
7 - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.7/pagehelper-spring-boot-autoconfigure-1.2.7-javadoc.jar!/" />  
8 - </JAVADOC>  
9 - <SOURCES>  
10 - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.7/pagehelper-spring-boot-autoconfigure-1.2.7-sources.jar!/" />  
11 - </SOURCES>  
12 - </library>  
13 -</component>  
14 \ No newline at end of file 0 \ No newline at end of file
.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_74.xml deleted
View file @95b0600
1 -<component name="libraryTable">  
2 - <library name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.7">  
3 - <CLASSES>  
4 - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.7/pagehelper-spring-boot-starter-1.2.7.jar!/" />  
5 - </CLASSES>  
6 - <JAVADOC>  
7 - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.7/pagehelper-spring-boot-starter-1.2.7-javadoc.jar!/" />  
8 - </JAVADOC>  
9 - <SOURCES>  
10 - <root url="jar://$MAVEN_REPOSITORY$/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.7/pagehelper-spring-boot-starter-1.2.7-sources.jar!/" />  
11 - </SOURCES>  
12 - </library>  
13 -</component>  
14 \ No newline at end of file 0 \ No newline at end of file
.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml deleted
View file @95b0600
1 -<component name="libraryTable">  
2 - <library name="Maven: commons-fileupload:commons-fileupload:1.3.3">  
3 - <CLASSES>  
4 - <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3.jar!/" />  
5 - </CLASSES>  
6 - <JAVADOC>  
7 - <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3-javadoc.jar!/" />  
8 - </JAVADOC>  
9 - <SOURCES>  
10 - <root url="jar://$MAVEN_REPOSITORY$/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3-sources.jar!/" />  
11 - </SOURCES>  
12 - </library>  
13 -</component>  
14 \ No newline at end of file 0 \ No newline at end of file
.idea/libraries/Maven__commons_io_commons_io_2_5.xml deleted
View file @95b0600
1 -<component name="libraryTable">  
2 - <library name="Maven: commons-io:commons-io:2.5">  
3 - <CLASSES>  
4 - <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.5/commons-io-2.5.jar!/" />  
5 - </CLASSES>  
6 - <JAVADOC>  
7 - <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.5/commons-io-2.5-javadoc.jar!/" />  
8 - </JAVADOC>  
9 - <SOURCES>  
10 - <root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.5/commons-io-2.5-sources.jar!/" />  
11 - </SOURCES>  
12 - </library>  
13 -</component>  
14 \ No newline at end of file 0 \ No newline at end of file
.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml deleted
View file @95b0600
1 -<component name="libraryTable">  
2 - <library name="Maven: org.mybatis:mybatis:3.4.6">  
3 - <CLASSES>  
4 - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.6/mybatis-3.4.6.jar!/" />  
5 - </CLASSES>  
6 - <JAVADOC>  
7 - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.6/mybatis-3.4.6-javadoc.jar!/" />  
8 - </JAVADOC>  
9 - <SOURCES>  
10 - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.4.6/mybatis-3.4.6-sources.jar!/" />  
11 - </SOURCES>  
12 - </library>  
13 -</component>  
14 \ No newline at end of file 0 \ No newline at end of file
.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml deleted
View file @95b0600
1 -<component name="libraryTable">  
2 - <library name="Maven: org.mybatis:mybatis-spring:1.3.2">  
3 - <CLASSES>  
4 - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.2/mybatis-spring-1.3.2.jar!/" />  
5 - </CLASSES>  
6 - <JAVADOC>  
7 - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.2/mybatis-spring-1.3.2-javadoc.jar!/" />  
8 - </JAVADOC>  
9 - <SOURCES>  
10 - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis-spring/1.3.2/mybatis-spring-1.3.2-sources.jar!/" />  
11 - </SOURCES>  
12 - </library>  
13 -</component>  
14 \ No newline at end of file 0 \ No newline at end of file
.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_24.xml deleted
View file @95b0600
1 -<component name="libraryTable">  
2 - <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2">  
3 - <CLASSES>  
4 - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-autoconfigure/1.3.2/mybatis-spring-boot-autoconfigure-1.3.2.jar!/" />  
5 - </CLASSES>  
6 - <JAVADOC>  
7 - <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!/" />  
8 - </JAVADOC>  
9 - <SOURCES>  
10 - <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!/" />  
11 - </SOURCES>  
12 - </library>  
13 -</component>  
14 \ No newline at end of file 0 \ No newline at end of file
.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_24.xml deleted
View file @95b0600
1 -<component name="libraryTable">  
2 - <library name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2">  
3 - <CLASSES>  
4 - <root url="jar://$MAVEN_REPOSITORY$/org/mybatis/spring/boot/mybatis-spring-boot-starter/1.3.2/mybatis-spring-boot-starter-1.3.2.jar!/" />  
5 - </CLASSES>  
6 - <JAVADOC>  
7 - <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!/" />  
8 - </JAVADOC>  
9 - <SOURCES>  
10 - <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!/" />  
11 - </SOURCES>  
12 - </library>  
13 -</component>  
14 \ No newline at end of file 0 \ No newline at end of file
.idea/workspace.xml
  View file @49be3a0
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 - <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment=""> 4 + <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="用户查询修改">
  5 + <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/controller/ZoneController.java" afterDir="false" />
  6 + <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/mapper/ZoneMapper.java" afterDir="false" />
  7 + <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/service/ZoneService.java" afterDir="false" />
5 <change beforePath="$PROJECT_DIR$/.idea/WMSV1.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/WMSV1.iml" afterDir="false" /> 8 <change beforePath="$PROJECT_DIR$/.idea/WMSV1.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/WMSV1.iml" afterDir="false" />
6 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml" beforeDir="false" />  
7 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_pool_commons_pool_1_6.xml" beforeDir="false" />  
8 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__de_odysseus_juel_juel_api_2_2_7.xml" beforeDir="false" />  
9 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__de_odysseus_juel_juel_impl_2_2_7.xml" beforeDir="false" />  
10 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__de_odysseus_juel_juel_spi_2_2_7.xml" beforeDir="false" />  
11 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__joda_time_joda_time_2_9_9.xml" beforeDir="false" />  
12 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_bpmn_converter_6_0_0.xml" beforeDir="false" />  
13 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_bpmn_model_6_0_0.xml" beforeDir="false" />  
14 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_dmn_api_6_0_0.xml" beforeDir="false" />  
15 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_dmn_model_6_0_0.xml" beforeDir="false" />  
16 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_engine_6_0_0.xml" beforeDir="false" />  
17 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_form_api_6_0_0.xml" beforeDir="false" />  
18 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_form_model_6_0_0.xml" beforeDir="false" />  
19 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_image_generator_6_0_0.xml" beforeDir="false" />  
20 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_process_validation_6_0_0.xml" beforeDir="false" />  
21 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_spring_6_0_0.xml" beforeDir="false" />  
22 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_activiti_activiti_spring_boot_starter_basic_6_0_0.xml" beforeDir="false" />  
23 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_email_1_4.xml" beforeDir="false" />  
24 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml" beforeDir="false" />  
25 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_5_0_7_RELEASE.xml" beforeDir="false" />  
26 - <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_testng_testng_7_0_0_beta4.xml" beforeDir="false" />  
27 - <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" /> 9 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_24.xml" beforeDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_64.xml" beforeDir="false" />
  11 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_74.xml" beforeDir="false" />
  12 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_74.xml" beforeDir="false" />
  13 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml" beforeDir="false" />
  14 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_5.xml" beforeDir="false" />
  15 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml" beforeDir="false" />
  16 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml" beforeDir="false" />
  17 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_24.xml" beforeDir="false" />
  18 + <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_24.xml" beforeDir="false" />
  19 + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
28 </list> 20 </list>
29 <ignored path="$PROJECT_DIR$/classes/" /> 21 <ignored path="$PROJECT_DIR$/classes/" />
30 <ignored path="$PROJECT_DIR$/target/" /> 22 <ignored path="$PROJECT_DIR$/target/" />
@@ -34,20 +26,239 @@ @@ -34,20 +26,239 @@
34 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> 26 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
35 <option name="LAST_RESOLUTION" value="IGNORE" /> 27 <option name="LAST_RESOLUTION" value="IGNORE" />
36 </component> 28 </component>
  29 + <component name="FileEditorManager">
  30 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
  31 + <file pinned="false" current-in-tab="false">
  32 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/domain/Zone.java">
  33 + <provider selected="true" editor-type-id="text-editor">
  34 + <state relative-caret-position="1955">
  35 + <caret line="85" selection-start-line="85" selection-end-line="85" />
  36 + <folding>
  37 + <element signature="imports" expanded="true" />
  38 + </folding>
  39 + </state>
  40 + </provider>
  41 + </entry>
  42 + </file>
  43 + <file pinned="false" current-in-tab="false">
  44 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/mapper/UserRoleMapper.java">
  45 + <provider selected="true" editor-type-id="text-editor">
  46 + <state relative-caret-position="207">
  47 + <caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
  48 + </state>
  49 + </provider>
  50 + </entry>
  51 + </file>
  52 + <file pinned="false" current-in-tab="false">
  53 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/mapper/ZoneMapper.java">
  54 + <provider selected="true" editor-type-id="text-editor">
  55 + <state relative-caret-position="115">
  56 + <caret line="5" column="39" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
  57 + <folding>
  58 + <element signature="imports" expanded="true" />
  59 + </folding>
  60 + </state>
  61 + </provider>
  62 + </entry>
  63 + </file>
  64 + <file pinned="false" current-in-tab="true">
  65 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/controller/ZoneController.java">
  66 + <provider selected="true" editor-type-id="text-editor">
  67 + <state relative-caret-position="404">
  68 + <caret line="22" column="20" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" />
  69 + <folding>
  70 + <element signature="imports" expanded="true" />
  71 + </folding>
  72 + </state>
  73 + </provider>
  74 + </entry>
  75 + </file>
  76 + <file pinned="false" current-in-tab="false">
  77 + <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">
  78 + <provider selected="true" editor-type-id="text-editor">
  79 + <state relative-caret-position="23">
  80 + <caret line="82" column="17" selection-start-line="82" selection-start-column="17" selection-end-line="82" selection-end-column="17" />
  81 + </state>
  82 + </provider>
  83 + </entry>
  84 + </file>
  85 + <file pinned="false" current-in-tab="false">
  86 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/service/ZoneService.java">
  87 + <provider selected="true" editor-type-id="text-editor">
  88 + <state relative-caret-position="115">
  89 + <caret line="5" column="42" selection-start-line="5" selection-start-column="42" selection-end-line="5" selection-end-column="42" />
  90 + <folding>
  91 + <element signature="imports" expanded="true" />
  92 + </folding>
  93 + </state>
  94 + </provider>
  95 + </entry>
  96 + </file>
  97 + <file pinned="false" current-in-tab="false">
  98 + <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">
  99 + <provider selected="true" editor-type-id="text-editor">
  100 + <state relative-caret-position="529">
  101 + <caret line="263" column="17" selection-start-line="263" selection-start-column="12" selection-end-line="263" selection-end-column="17" />
  102 + </state>
  103 + </provider>
  104 + </entry>
  105 + </file>
  106 + </leaf>
  107 + </component>
  108 + <component name="FileTemplateManagerImpl">
  109 + <option name="RECENT_TEMPLATES">
  110 + <list>
  111 + <option value="Interface" />
  112 + <option value="Class" />
  113 + </list>
  114 + </option>
  115 + </component>
37 <component name="Git.Settings"> 116 <component name="Git.Settings">
38 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> 117 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
  118 + <option name="RECENT_BRANCH_BY_REPOSITORY">
  119 + <map>
  120 + <entry key="$PROJECT_DIR$" value="developMain" />
  121 + </map>
  122 + </option>
  123 + </component>
  124 + <component name="IdeDocumentHistory">
  125 + <option name="CHANGED_PATHS">
  126 + <list>
  127 + <option value="$PROJECT_DIR$/src/main/resources/mybatis/system/UserMapper.xml" />
  128 + <option value="$PROJECT_DIR$/src/main/resources/templates/system/user/user.html" />
  129 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/domain/Zone.java" />
  130 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/mapper/ZoneMapper.java" />
  131 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/service/ZoneService.java" />
  132 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/controller/ZoneController.java" />
  133 + </list>
  134 + </option>
39 </component> 135 </component>
40 <component name="ProjectFrameBounds" extendedState="6"> 136 <component name="ProjectFrameBounds" extendedState="6">
41 - <option name="x" value="140" />  
42 - <option name="y" value="120" />  
43 - <option name="width" value="1765" />  
44 - <option name="height" value="735" /> 137 + <option name="x" value="-1928" />
  138 + <option name="y" value="-8" />
  139 + <option name="width" value="1936" />
  140 + <option name="height" value="1056" />
  141 + </component>
  142 + <component name="ProjectView">
  143 + <navigator proportions="" version="1">
  144 + <foldersAlwaysOnTop value="true" />
  145 + </navigator>
  146 + <panes>
  147 + <pane id="ProjectPane">
  148 + <subPane>
  149 + <expand>
  150 + <path>
  151 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  152 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  153 + </path>
  154 + <path>
  155 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  156 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  157 + <item name="src" type="462c0819:PsiDirectoryNode" />
  158 + </path>
  159 + <path>
  160 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  161 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  162 + <item name="src" type="462c0819:PsiDirectoryNode" />
  163 + <item name="main" type="462c0819:PsiDirectoryNode" />
  164 + </path>
  165 + <path>
  166 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  167 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  168 + <item name="src" type="462c0819:PsiDirectoryNode" />
  169 + <item name="main" type="462c0819:PsiDirectoryNode" />
  170 + <item name="java" type="462c0819:PsiDirectoryNode" />
  171 + </path>
  172 + <path>
  173 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  174 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  175 + <item name="src" type="462c0819:PsiDirectoryNode" />
  176 + <item name="main" type="462c0819:PsiDirectoryNode" />
  177 + <item name="java" type="462c0819:PsiDirectoryNode" />
  178 + <item name="com" type="462c0819:PsiDirectoryNode" />
  179 + </path>
  180 + <path>
  181 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  182 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  183 + <item name="src" type="462c0819:PsiDirectoryNode" />
  184 + <item name="main" type="462c0819:PsiDirectoryNode" />
  185 + <item name="java" type="462c0819:PsiDirectoryNode" />
  186 + <item name="com" type="462c0819:PsiDirectoryNode" />
  187 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  188 + </path>
  189 + <path>
  190 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  191 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  192 + <item name="src" type="462c0819:PsiDirectoryNode" />
  193 + <item name="main" type="462c0819:PsiDirectoryNode" />
  194 + <item name="java" type="462c0819:PsiDirectoryNode" />
  195 + <item name="com" type="462c0819:PsiDirectoryNode" />
  196 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  197 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  198 + </path>
  199 + <path>
  200 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  201 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  202 + <item name="src" type="462c0819:PsiDirectoryNode" />
  203 + <item name="main" type="462c0819:PsiDirectoryNode" />
  204 + <item name="java" type="462c0819:PsiDirectoryNode" />
  205 + <item name="com" type="462c0819:PsiDirectoryNode" />
  206 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  207 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  208 + <item name="general" type="462c0819:PsiDirectoryNode" />
  209 + </path>
  210 + <path>
  211 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  212 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  213 + <item name="src" type="462c0819:PsiDirectoryNode" />
  214 + <item name="main" type="462c0819:PsiDirectoryNode" />
  215 + <item name="java" type="462c0819:PsiDirectoryNode" />
  216 + <item name="com" type="462c0819:PsiDirectoryNode" />
  217 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  218 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  219 + <item name="general" type="462c0819:PsiDirectoryNode" />
  220 + <item name="zone" type="462c0819:PsiDirectoryNode" />
  221 + </path>
  222 + <path>
  223 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  224 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  225 + <item name="src" type="462c0819:PsiDirectoryNode" />
  226 + <item name="test" type="462c0819:PsiDirectoryNode" />
  227 + </path>
  228 + <path>
  229 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  230 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  231 + <item name="src" type="462c0819:PsiDirectoryNode" />
  232 + <item name="test" type="462c0819:PsiDirectoryNode" />
  233 + <item name="java" type="462c0819:PsiDirectoryNode" />
  234 + </path>
  235 + <path>
  236 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  237 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  238 + <item name="src" type="462c0819:PsiDirectoryNode" />
  239 + <item name="test" type="462c0819:PsiDirectoryNode" />
  240 + <item name="java" type="462c0819:PsiDirectoryNode" />
  241 + <item name="com.huaheng.test" type="462c0819:PsiDirectoryNode" />
  242 + </path>
  243 + </expand>
  244 + <select />
  245 + </subPane>
  246 + </pane>
  247 + <pane id="Scope" />
  248 + <pane id="PackagesPane" />
  249 + </panes>
45 </component> 250 </component>
46 <component name="PropertiesComponent"> 251 <component name="PropertiesComponent">
  252 + <property name="RequestMappingsPanelOrder0" value="0" />
  253 + <property name="RequestMappingsPanelOrder1" value="1" />
  254 + <property name="RequestMappingsPanelWidth0" value="75" />
  255 + <property name="RequestMappingsPanelWidth1" value="75" />
47 <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> 256 <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
48 <property name="WebServerToolWindowFactoryState" value="false" /> 257 <property name="WebServerToolWindowFactoryState" value="false" />
49 <property name="aspect.path.notification.shown" value="true" /> 258 <property name="aspect.path.notification.shown" value="true" />
50 - <property name="last_opened_file_path" value="$PROJECT_DIR$" /> 259 + <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1565075665688" />
  260 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../WMSV1" />
  261 + <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
51 </component> 262 </component>
52 <component name="RunDashboard"> 263 <component name="RunDashboard">
53 <option name="ruleStates"> 264 <option name="ruleStates">
@@ -61,7 +272,20 @@ @@ -61,7 +272,20 @@
61 </list> 272 </list>
62 </option> 273 </option>
63 </component> 274 </component>
64 - <component name="RunManager"> 275 + <component name="RunManager" selected="Application.CreateCode">
  276 + <configuration name="CreateCode" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
  277 + <option name="MAIN_CLASS_NAME" value="com.huaheng.test.CreateCode" />
  278 + <module name="WMSV1" />
  279 + <extension name="coverage">
  280 + <pattern>
  281 + <option name="PATTERN" value="com.huaheng.test.*" />
  282 + <option name="ENABLED" value="true" />
  283 + </pattern>
  284 + </extension>
  285 + <method v="2">
  286 + <option name="Make" enabled="true" />
  287 + </method>
  288 + </configuration>
65 <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> 289 <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
66 <module name="WMSV1" /> 290 <module name="WMSV1" />
67 <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> 291 <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
@@ -69,6 +293,11 @@ @@ -69,6 +293,11 @@
69 <option name="Make" enabled="true" /> 293 <option name="Make" enabled="true" />
70 </method> 294 </method>
71 </configuration> 295 </configuration>
  296 + <recent_temporary>
  297 + <list>
  298 + <item itemvalue="Application.CreateCode" />
  299 + </list>
  300 + </recent_temporary>
72 </component> 301 </component>
73 <component name="SvnConfiguration"> 302 <component name="SvnConfiguration">
74 <configuration /> 303 <configuration />
@@ -81,51 +310,315 @@ @@ -81,51 +310,315 @@
81 <option name="presentableId" value="Default" /> 310 <option name="presentableId" value="Default" />
82 <updated>1563950700252</updated> 311 <updated>1563950700252</updated>
83 <workItem from="1563950701881" duration="73000" /> 312 <workItem from="1563950701881" duration="73000" />
  313 + <workItem from="1565055472980" duration="7608000" />
84 </task> 314 </task>
  315 + <task id="LOCAL-00001" summary="用户查询修改">
  316 + <created>1565058322310</created>
  317 + <option name="number" value="00001" />
  318 + <option name="presentableId" value="LOCAL-00001" />
  319 + <option name="project" value="LOCAL" />
  320 + <updated>1565058322310</updated>
  321 + </task>
  322 + <option name="localTasksCounter" value="2" />
85 <servers /> 323 <servers />
86 </component> 324 </component>
87 <component name="TimeTrackingManager"> 325 <component name="TimeTrackingManager">
88 - <option name="totallyTimeSpent" value="73000" /> 326 + <option name="totallyTimeSpent" value="7998000" />
89 </component> 327 </component>
90 <component name="ToolWindowManager"> 328 <component name="ToolWindowManager">
91 - <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> 329 + <frame x="-1928" y="-8" width="1936" height="1056" extended-state="6" />
  330 + <editor active="true" />
92 <layout> 331 <layout>
93 - <window_info id="Designer" />  
94 - <window_info id="Image Layers" />  
95 - <window_info id="UI Designer" />  
96 - <window_info id="Favorites" side_tool="true" />  
97 - <window_info id="Capture Tool" />  
98 - <window_info id="Web" side_tool="true" />  
99 - <window_info content_ui="combo" id="Project" order="0" weight="0.25" /> 332 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1988273" />
100 <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> 333 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
101 - <window_info anchor="bottom" id="Spring" />  
102 - <window_info anchor="bottom" id="Terminal" />  
103 - <window_info anchor="bottom" id="Event Log" side_tool="true" />  
104 - <window_info anchor="bottom" id="Messages" />  
105 - <window_info anchor="bottom" id="Java Enterprise" />  
106 - <window_info anchor="bottom" id="Database Changes" />  
107 - <window_info anchor="bottom" id="Version Control" />  
108 - <window_info anchor="bottom" id="Docker" show_stripe_button="false" /> 334 + <window_info id="Designer" order="2" />
  335 + <window_info id="UI Designer" order="3" />
  336 + <window_info id="Favorites" order="4" side_tool="true" />
  337 + <window_info id="Capture Tool" order="5" />
  338 + <window_info id="Web" order="6" side_tool="true" />
  339 + <window_info id="Image Layers" order="7" />
109 <window_info anchor="bottom" id="Message" order="0" /> 340 <window_info anchor="bottom" id="Message" order="0" />
110 <window_info anchor="bottom" id="Find" order="1" /> 341 <window_info anchor="bottom" id="Find" order="1" />
111 - <window_info anchor="bottom" id="Run" order="2" />  
112 - <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> 342 + <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.329718" />
  343 + <window_info anchor="bottom" id="Debug" order="3" weight="0.26030368" />
113 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> 344 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
114 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> 345 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
115 <window_info anchor="bottom" id="TODO" order="6" /> 346 <window_info anchor="bottom" id="TODO" order="6" />
116 - <window_info anchor="right" id="Maven" />  
117 - <window_info anchor="right" id="Palette" />  
118 - <window_info anchor="right" id="Capture Analysis" />  
119 - <window_info anchor="right" id="Database" />  
120 - <window_info anchor="right" id="Palette&#9;" />  
121 - <window_info anchor="right" id="Theme Preview" />  
122 - <window_info anchor="right" id="Bean Validation" /> 347 + <window_info anchor="bottom" id="Spring" order="7" />
  348 + <window_info anchor="bottom" id="Terminal" order="8" />
  349 + <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
  350 + <window_info anchor="bottom" id="Java Enterprise" order="10" />
  351 + <window_info anchor="bottom" id="Database Changes" order="11" />
  352 + <window_info anchor="bottom" id="Version Control" order="12" weight="0.17895879" />
  353 + <window_info anchor="bottom" id="Docker" order="13" show_stripe_button="false" />
  354 + <window_info anchor="bottom" id="Messages" order="14" weight="0.3286119" />
  355 + <window_info anchor="right" id="BPMNPalette" />
123 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 356 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
124 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 357 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
125 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> 358 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
  359 + <window_info anchor="right" id="Maven" order="3" />
  360 + <window_info anchor="right" id="Palette" order="4" />
  361 + <window_info anchor="right" id="Capture Analysis" order="5" />
  362 + <window_info anchor="right" id="Database" order="6" />
  363 + <window_info anchor="right" id="Palette&#9;" order="7" />
  364 + <window_info anchor="right" id="Theme Preview" order="8" />
  365 + <window_info anchor="right" id="Bean Validation" order="9" />
126 </layout> 366 </layout>
127 </component> 367 </component>
128 <component name="TypeScriptGeneratedFilesManager"> 368 <component name="TypeScriptGeneratedFilesManager">
129 <option name="version" value="1" /> 369 <option name="version" value="1" />
130 </component> 370 </component>
  371 + <component name="Vcs.Log.Tabs.Properties">
  372 + <option name="TAB_STATES">
  373 + <map>
  374 + <entry key="MAIN">
  375 + <value>
  376 + <State>
  377 + <option name="RECENTLY_FILTERED_USER_GROUPS">
  378 + <collection />
  379 + </option>
  380 + <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
  381 + <collection />
  382 + </option>
  383 + <option name="COLUMN_ORDER">
  384 + <list>
  385 + <option value="0" />
  386 + <option value="1" />
  387 + <option value="2" />
  388 + <option value="3" />
  389 + </list>
  390 + </option>
  391 + </State>
  392 + </value>
  393 + </entry>
  394 + </map>
  395 + </option>
  396 + </component>
  397 + <component name="VcsManagerConfiguration">
  398 + <MESSAGE value="用户查询修改" />
  399 + <option name="LAST_COMMIT_MESSAGE" value="用户查询修改" />
  400 + </component>
  401 + <component name="editorHistoryManager">
  402 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java">
  403 + <provider selected="true" editor-type-id="text-editor">
  404 + <state relative-caret-position="131">
  405 + <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
  406 + </state>
  407 + </provider>
  408 + </entry>
  409 + <entry file="file://$PROJECT_DIR$/pom.xml">
  410 + <provider selected="true" editor-type-id="text-editor">
  411 + <state relative-caret-position="23">
  412 + <caret line="367" column="21" selection-start-line="367" selection-start-column="21" selection-end-line="367" selection-end-column="21" />
  413 + </state>
  414 + </provider>
  415 + </entry>
  416 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/UserRole.java">
  417 + <provider selected="true" editor-type-id="text-editor">
  418 + <state relative-caret-position="177">
  419 + <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
  420 + </state>
  421 + </provider>
  422 + </entry>
  423 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/general/CompanyMapper.xml">
  424 + <provider selected="true" editor-type-id="text-editor">
  425 + <state relative-caret-position="120">
  426 + <caret line="49" column="2" selection-start-line="49" selection-start-column="2" selection-end-line="49" selection-end-column="2" />
  427 + </state>
  428 + </provider>
  429 + </entry>
  430 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java">
  431 + <provider selected="true" editor-type-id="text-editor">
  432 + <state relative-caret-position="407">
  433 + <caret line="63" column="44" selection-start-line="63" selection-start-column="44" selection-end-line="63" selection-end-column="44" />
  434 + </state>
  435 + </provider>
  436 + </entry>
  437 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/user/user.html">
  438 + <provider selected="true" editor-type-id="text-editor">
  439 + <state relative-caret-position="79">
  440 + <caret line="41" column="70" selection-start-line="41" selection-start-column="70" selection-end-line="41" selection-end-column="70" />
  441 + </state>
  442 + </provider>
  443 + </entry>
  444 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/domain/Warehouse.java">
  445 + <provider selected="true" editor-type-id="text-editor">
  446 + <state relative-caret-position="-4830">
  447 + <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
  448 + </state>
  449 + </provider>
  450 + </entry>
  451 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseServiceImpl.java">
  452 + <provider selected="true" editor-type-id="text-editor">
  453 + <state relative-caret-position="92">
  454 + <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
  455 + </state>
  456 + </provider>
  457 + </entry>
  458 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/UserCompany.java">
  459 + <provider selected="true" editor-type-id="text-editor">
  460 + <state relative-caret-position="-84">
  461 + <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
  462 + </state>
  463 + </provider>
  464 + </entry>
  465 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/role/domain/Role.java">
  466 + <provider selected="true" editor-type-id="text-editor">
  467 + <state relative-caret-position="276">
  468 + <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
  469 + </state>
  470 + </provider>
  471 + </entry>
  472 + <entry file="file://$PROJECT_DIR$/src/main/resources/application-druid.properties">
  473 + <provider selected="true" editor-type-id="text-editor">
  474 + <state relative-caret-position="-313" />
  475 + </provider>
  476 + </entry>
  477 + <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
  478 + <provider selected="true" editor-type-id="text-editor">
  479 + <state relative-caret-position="-1242" />
  480 + </provider>
  481 + </entry>
  482 + <entry file="jar://C:/Program Files (x86)/jdk1.9/src.zip!/java/util/Date.java">
  483 + <provider selected="true" editor-type-id="text-editor">
  484 + <state relative-caret-position="631">
  485 + <caret line="130" column="13" selection-start-line="130" selection-start-column="13" selection-end-line="130" selection-end-column="13" />
  486 + </state>
  487 + </provider>
  488 + </entry>
  489 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java">
  490 + <provider selected="true" editor-type-id="text-editor">
  491 + <state>
  492 + <caret line="198" column="17" selection-start-line="198" selection-start-column="17" selection-end-line="198" selection-end-column="17" />
  493 + <folding>
  494 + <element signature="imports" expanded="true" />
  495 + </folding>
  496 + </state>
  497 + </provider>
  498 + </entry>
  499 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java">
  500 + <provider selected="true" editor-type-id="text-editor">
  501 + <state relative-caret-position="-1716">
  502 + <caret line="159" column="36" selection-start-line="159" selection-start-column="36" selection-end-line="159" selection-end-column="36" />
  503 + <folding>
  504 + <element signature="e#5289#5290#0" expanded="true" />
  505 + <element signature="e#5343#5344#0" expanded="true" />
  506 + </folding>
  507 + </state>
  508 + </provider>
  509 + </entry>
  510 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java">
  511 + <provider selected="true" editor-type-id="text-editor">
  512 + <state relative-caret-position="170">
  513 + <caret line="41" column="22" selection-start-line="41" selection-start-column="22" selection-end-line="41" selection-end-column="22" />
  514 + </state>
  515 + </provider>
  516 + </entry>
  517 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/User.java">
  518 + <provider selected="true" editor-type-id="text-editor">
  519 + <state relative-caret-position="-2338">
  520 + <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
  521 + <folding>
  522 + <element signature="imports" expanded="true" />
  523 + </folding>
  524 + </state>
  525 + </provider>
  526 + </entry>
  527 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/system/UserMapper.xml">
  528 + <provider selected="true" editor-type-id="text-editor">
  529 + <state relative-caret-position="-4031">
  530 + <caret line="2" selection-start-line="2" selection-end-line="2" />
  531 + </state>
  532 + </provider>
  533 + </entry>
  534 + <entry file="file://$PROJECT_DIR$/src/test/java/com.huaheng.test/CreateCode.java">
  535 + <provider selected="true" editor-type-id="text-editor">
  536 + <state relative-caret-position="23">
  537 + <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
  538 + </state>
  539 + </provider>
  540 + </entry>
  541 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/mapper/UserMapper.java">
  542 + <provider selected="true" editor-type-id="text-editor">
  543 + <state relative-caret-position="-345">
  544 + <caret line="14" selection-start-line="14" selection-end-line="14" />
  545 + </state>
  546 + </provider>
  547 + </entry>
  548 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/mapper/UserRoleMapper.java">
  549 + <provider selected="true" editor-type-id="text-editor">
  550 + <state relative-caret-position="207">
  551 + <caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
  552 + </state>
  553 + </provider>
  554 + </entry>
  555 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/domain/Zone.java">
  556 + <provider selected="true" editor-type-id="text-editor">
  557 + <state relative-caret-position="1955">
  558 + <caret line="85" selection-start-line="85" selection-end-line="85" />
  559 + <folding>
  560 + <element signature="imports" expanded="true" />
  561 + </folding>
  562 + </state>
  563 + </provider>
  564 + </entry>
  565 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/service/ZoneService.java">
  566 + <provider selected="true" editor-type-id="text-editor">
  567 + <state relative-caret-position="115">
  568 + <caret line="5" column="42" selection-start-line="5" selection-start-column="42" selection-end-line="5" selection-end-column="42" />
  569 + <folding>
  570 + <element signature="imports" expanded="true" />
  571 + </folding>
  572 + </state>
  573 + </provider>
  574 + </entry>
  575 + <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">
  576 + <provider selected="true" editor-type-id="text-editor">
  577 + <state relative-caret-position="138">
  578 + <caret line="22" column="17" selection-start-line="22" selection-start-column="17" selection-end-line="22" selection-end-column="17" />
  579 + </state>
  580 + </provider>
  581 + </entry>
  582 + <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">
  583 + <provider selected="true" editor-type-id="text-editor">
  584 + <state relative-caret-position="138">
  585 + <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
  586 + </state>
  587 + </provider>
  588 + </entry>
  589 + <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">
  590 + <provider selected="true" editor-type-id="text-editor">
  591 + <state relative-caret-position="23">
  592 + <caret line="82" column="17" selection-start-line="82" selection-start-column="17" selection-end-line="82" selection-end-column="17" />
  593 + </state>
  594 + </provider>
  595 + </entry>
  596 + <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">
  597 + <provider selected="true" editor-type-id="text-editor">
  598 + <state relative-caret-position="529">
  599 + <caret line="263" column="17" selection-start-line="263" selection-start-column="12" selection-end-line="263" selection-end-column="17" />
  600 + </state>
  601 + </provider>
  602 + </entry>
  603 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/mapper/ZoneMapper.java">
  604 + <provider selected="true" editor-type-id="text-editor">
  605 + <state relative-caret-position="115">
  606 + <caret line="5" column="39" selection-start-line="5" selection-start-column="39" selection-end-line="5" selection-end-column="39" />
  607 + <folding>
  608 + <element signature="imports" expanded="true" />
  609 + </folding>
  610 + </state>
  611 + </provider>
  612 + </entry>
  613 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/controller/ZoneController.java">
  614 + <provider selected="true" editor-type-id="text-editor">
  615 + <state relative-caret-position="404">
  616 + <caret line="22" column="20" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" />
  617 + <folding>
  618 + <element signature="imports" expanded="true" />
  619 + </folding>
  620 + </state>
  621 + </provider>
  622 + </entry>
  623 + </component>
131 </project> 624 </project>
132 \ No newline at end of file 625 \ No newline at end of file
src/main/java/com/huaheng/pc/general/zone/controller/ZoneController.java 0 → 100644
  View file @49be3a0
  1 +package com.huaheng.pc.general.zone.controller;
  2 +
  3 +import org.springframework.stereotype.Component;
  4 +import org.springframework.web.bind.annotation.RequestMapping;
  5 +
  6 +import javax.annotation.Resource;
  7 +
  8 +@Component
  9 +@RequestMapping
  10 +public class ZoneController {
  11 +
  12 +
  13 +
  14 +
  15 +}