.idea/.gitignore

@@ -0,0 +1,29 @@
+HELP.md
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
+
+### VS Code ###
+.vscode/

.idea/workspace.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
+<<<<<<< HEAD
+    <list default="true" id="6505dcd2-5659-45fa-bd90-6fe6ec1b2379" name="Default  Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" />
+=======
     <list default="true" id="6505dcd2-5659-45fa-bd90-6fe6ec1b2379" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml" beforeDir="false" />
@@ -10,6 +15,7 @@
       <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaPersonController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/controller/TaPersonController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/SysUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com.huiju.welcome/model/SysUser.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+>>>>>>> c9078e4ef36a1a33f14dab53564f84e63f94977b
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -25,6 +31,8 @@
     <option name="testRunner" value="GRADLE" />
     <option name="delegatedBuild" value="true" />
   </component>
+<<<<<<< HEAD
+=======
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
@@ -74,6 +82,7 @@
       </file>
     </leaf>
   </component>
+>>>>>>> c9078e4ef36a1a33f14dab53564f84e63f94977b
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
@@ -102,6 +111,8 @@
       </MavenImportingSettings>
     </option>
   </component>
+<<<<<<< HEAD
+=======
   <component name="MavenProjectNavigator">
     <treeState>
       <expand>
@@ -118,6 +129,7 @@
       <select />
     </treeState>
   </component>
+>>>>>>> c9078e4ef36a1a33f14dab53564f84e63f94977b
   <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-8" />
     <option name="y" value="-8" />
@@ -341,6 +353,10 @@
       <workItem from="1575454478943" duration="611000" />
       <workItem from="1575508290475" duration="946000" />
       <workItem from="1575510190395" duration="665000" />
+<<<<<<< HEAD
+      <workItem from="1575513615922" duration="83000" />
+=======
+>>>>>>> c9078e4ef36a1a33f14dab53564f84e63f94977b
     </task>
     <servers />
   </component>
@@ -424,6 +440,8 @@
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <SUITE FILE_PATH="coverage/service_welcome3$MainbizApplication.ic" NAME="MainbizApplication Coverage Results" MODIFIED="1575510263453" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
+<<<<<<< HEAD
+=======
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
@@ -486,6 +504,7 @@
         </state>
       </provider>
     </entry>
+>>>>>>> c9078e4ef36a1a33f14dab53564f84e63f94977b
   </component>
   <component name="masterDetails">
     <states>