Merge branch '1220' into bf_master

# Conflicts:
#	wms_pro/hd/nladmin-system/.idea/.gitignore
#	wms_pro/hd/nladmin-system/.idea/compiler.xml
#	wms_pro/hd/nladmin-system/.idea/encodings.xml
#	wms_pro/hd/nladmin-system/.idea/jarRepositories.xml
#	wms_pro/hd/nladmin-system/.idea/misc.xml
#	wms_pro/hd/nladmin-system/.idea/vcs.xml

wms_pro/hd/nladmin-system/.idea/.gitignore

@@ -1,8 +1,8 @@
-# Default ignored files
+# 默认忽略的文件
 /shelf/
 /workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
 # Datasource local storage ignored files
 /dataSources/
 /dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/

wms_pro/hd/nladmin-system/.idea/compiler.xml

@@ -2,7 +2,6 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
-      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
@@ -10,9 +9,6 @@
         <module name="nladmin-system" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel target="8">
-      <module name="nladmin-system" target="1.8" />
-    </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">

wms_pro/hd/nladmin-system/.idea/encodings.xml

@@ -3,4 +3,4 @@
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
   </component>
-</project>
+</project>

wms_pro/hd/nladmin-system/.idea/jarRepositories.xml

@@ -17,4 +17,4 @@
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
   </component>
-</project>
+</project>

wms_pro/hd/nladmin-system/.idea/misc.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
@@ -8,4 +9,4 @@
     </option>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
-</project>
+</project>

wms_pro/hd/nladmin-system/.idea/vcs.xml

@@ -3,4 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
   </component>
-</project>
+</project>