修改采购进口矿

.idea/libraries/Maven__antlr_antlr_2_7_7.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: antlr:antlr:2.7.7">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/antlr/antlr/2.7.7/antlr-2.7.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/antlr/antlr/2.7.7/antlr-2.7.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/antlr/antlr/2.7.7/antlr-2.7.7-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/antlr/antlr/2.7.7/antlr-2.7.7.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/antlr/antlr/2.7.7/antlr-2.7.7-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: aopalliance:aopalliance:1.0">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/aopalliance/aopalliance/1.0/aopalliance-1.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__cglib_cglib_3_2_5.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: cglib:cglib:3.2.5">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/cglib/cglib/3.2.5/cglib-3.2.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/cglib/cglib/3.2.5/cglib-3.2.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/cglib/cglib/3.2.5/cglib-3.2.5-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/cglib/cglib/3.2.5/cglib-3.2.5.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/cglib/cglib/3.2.5/cglib-3.2.5-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: ch.qos.logback:logback-classic:1.2.3">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: ch.qos.logback:logback-core:1.2.3">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.alibaba:druid:1.1.10">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/alibaba/druid/1.1.10/druid-1.1.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/alibaba/druid/1.1.10/druid-1.1.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/alibaba/druid/1.1.10/druid-1.1.10-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/alibaba/druid/1.1.10/druid-1.1.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/alibaba/druid/1.1.10/druid-1.1.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/alibaba/druid/1.1.10/druid-1.1.10-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_10.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.alibaba:druid-spring-boot-starter:1.1.10">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/alibaba/druid-spring-boot-starter/1.1.10/druid-spring-boot-starter-1.1.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/alibaba/druid-spring-boot-starter/1.1.10/druid-spring-boot-starter-1.1.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/alibaba/druid-spring-boot-starter/1.1.10/druid-spring-boot-starter-1.1.10-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/alibaba/druid-spring-boot-starter/1.1.10/druid-spring-boot-starter-1.1.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/alibaba/druid-spring-boot-starter/1.1.10/druid-spring-boot-starter-1.1.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/alibaba/druid-spring-boot-starter/1.1.10/druid-spring-boot-starter-1.1.10-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.alibaba:fastjson:1.2.47">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/alibaba/fastjson/1.2.47/fastjson-1.2.47.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/alibaba/fastjson/1.2.47/fastjson-1.2.47-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/alibaba/fastjson/1.2.47/fastjson-1.2.47-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/alibaba/fastjson/1.2.47/fastjson-1.2.47.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/alibaba/fastjson/1.2.47/fastjson-1.2.47-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_2.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.baomidou:mybatis-plus:3.4.2">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus/3.4.2/mybatis-plus-3.4.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus/3.4.2/mybatis-plus-3.4.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus/3.4.2/mybatis-plus-3.4.2-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus/3.4.2/mybatis-plus-3.4.2.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus/3.4.2/mybatis-plus-3.4.2-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_2.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus-annotation/3.4.2/mybatis-plus-annotation-3.4.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus-annotation/3.4.2/mybatis-plus-annotation-3.4.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus-annotation/3.4.2/mybatis-plus-annotation-3.4.2-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus-annotation/3.4.2/mybatis-plus-annotation-3.4.2.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus-annotation/3.4.2/mybatis-plus-annotation-3.4.2-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_2.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus-boot-starter/3.4.2/mybatis-plus-boot-starter-3.4.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus-boot-starter/3.4.2/mybatis-plus-boot-starter-3.4.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus-boot-starter/3.4.2/mybatis-plus-boot-starter-3.4.2-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus-boot-starter/3.4.2/mybatis-plus-boot-starter-3.4.2.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus-boot-starter/3.4.2/mybatis-plus-boot-starter-3.4.2-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_2.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.baomidou:mybatis-plus-core:3.4.2">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus-core/3.4.2/mybatis-plus-core-3.4.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus-core/3.4.2/mybatis-plus-core-3.4.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus-core/3.4.2/mybatis-plus-core-3.4.2-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus-core/3.4.2/mybatis-plus-core-3.4.2.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus-core/3.4.2/mybatis-plus-core-3.4.2-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_2.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.baomidou:mybatis-plus-extension:3.4.2">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus-extension/3.4.2/mybatis-plus-extension-3.4.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus-extension/3.4.2/mybatis-plus-extension-3.4.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus-extension/3.4.2/mybatis-plus-extension-3.4.2-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus-extension/3.4.2/mybatis-plus-extension-3.4.2.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/baomidou/mybatis-plus-extension/3.4.2/mybatis-plus-extension-3.4.2-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_beust_jcommander_1_48.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.beust:jcommander:1.48">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/beust/jcommander/1.48/jcommander-1.48-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/beust/jcommander/1.48/jcommander-1.48-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/beust/jcommander/1.48/jcommander-1.48-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/beust/jcommander/1.48/jcommander-1.48-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_ctrip_framework_apollo_apollo_client_1_1_0.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.ctrip.framework.apollo:apollo-client:1.1.0">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/ctrip/framework/apollo/apollo-client/1.1.0/apollo-client-1.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/ctrip/framework/apollo/apollo-client/1.1.0/apollo-client-1.1.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/ctrip/framework/apollo/apollo-client/1.1.0/apollo-client-1.1.0-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/ctrip/framework/apollo/apollo-client/1.1.0/apollo-client-1.1.0.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/ctrip/framework/apollo/apollo-client/1.1.0/apollo-client-1.1.0-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_ctrip_framework_apollo_apollo_core_1_1_0.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.ctrip.framework.apollo:apollo-core:1.1.0">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/ctrip/framework/apollo/apollo-core/1.1.0/apollo-core-1.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/ctrip/framework/apollo/apollo-core/1.1.0/apollo-core-1.1.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/ctrip/framework/apollo/apollo-core/1.1.0/apollo-core-1.1.0-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/ctrip/framework/apollo/apollo-core/1.1.0/apollo-core-1.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/ctrip/framework/apollo/apollo-core/1.1.0/apollo-core-1.1.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/ctrip/framework/apollo/apollo-core/1.1.0/apollo-core-1.1.0-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.fasterxml:classmate:1.3.4">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/classmate/1.3.4/classmate-1.3.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/classmate/1.3.4/classmate-1.3.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/classmate/1.3.4/classmate-1.3.4-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/fasterxml/classmate/1.3.4/classmate-1.3.4.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/fasterxml/classmate/1.3.4/classmate-1.3.4-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/core/jackson-annotations/2.9.0/jackson-annotations-2.9.0-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_7.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/core/jackson-core/2.9.7/jackson-core-2.9.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/core/jackson-core/2.9.7/jackson-core-2.9.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/core/jackson-core/2.9.7/jackson-core-2.9.7-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/core/jackson-core/2.9.7/jackson-core-2.9.7.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/core/jackson-core/2.9.7/jackson-core-2.9.7-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_7.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.7">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/core/jackson-databind/2.9.7/jackson-databind-2.9.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/core/jackson-databind/2.9.7/jackson-databind-2.9.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/core/jackson-databind/2.9.7/jackson-databind-2.9.7-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/core/jackson-databind/2.9.7/jackson-databind-2.9.7.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/core/jackson-databind/2.9.7/jackson-databind-2.9.7-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_7.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.7">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.7/jackson-datatype-jdk8-2.9.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.7/jackson-datatype-jdk8-2.9.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.7/jackson-datatype-jdk8-2.9.7-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.7/jackson-datatype-jdk8-2.9.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.7/jackson-datatype-jdk8-2.9.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/2.9.7/jackson-datatype-jdk8-2.9.7-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_7.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.7">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.7/jackson-datatype-jsr310-2.9.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.7/jackson-datatype-jsr310-2.9.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.7/jackson-datatype-jsr310-2.9.7-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.7/jackson-datatype-jsr310-2.9.7.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/2.9.7/jackson-datatype-jsr310-2.9.7-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_9_7.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.fasterxml.jackson.module:jackson-module-afterburner:2.9.7">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.7/jackson-module-afterburner-2.9.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.7/jackson-module-afterburner-2.9.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.7/jackson-module-afterburner-2.9.7-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.7/jackson-module-afterburner-2.9.7.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.7/jackson-module-afterburner-2.9.7-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_7.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.7">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.7/jackson-module-parameter-names-2.9.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.7/jackson-module-parameter-names-2.9.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.7/jackson-module-parameter-names-2.9.7-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.7/jackson-module-parameter-names-2.9.7.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/fasterxml/jackson/module/jackson-module-parameter-names/2.9.7/jackson-module-parameter-names-2.9.7-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_github_andrewoma_dexx_dexx_collections_0_2.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.github.andrewoma.dexx:dexx-collections:0.2">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/andrewoma/dexx/dexx-collections/0.2/dexx-collections-0.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/andrewoma/dexx/dexx-collections/0.2/dexx-collections-0.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/andrewoma/dexx/dexx-collections/0.2/dexx-collections-0.2-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/github/andrewoma/dexx/dexx-collections/0.2/dexx-collections-0.2.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/github/andrewoma/dexx/dexx-collections/0.2/dexx-collections-0.2-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_github_jai_imageio_jai_imageio_core_1_3_1.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.github.jai-imageio:jai-imageio-core:1.3.1">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/jai-imageio/jai-imageio-core/1.3.1/jai-imageio-core-1.3.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/jai-imageio/jai-imageio-core/1.3.1/jai-imageio-core-1.3.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/jai-imageio/jai-imageio-core/1.3.1/jai-imageio-core-1.3.1-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/github/jai-imageio/jai-imageio-core/1.3.1/jai-imageio-core-1.3.1.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/github/jai-imageio/jai-imageio-core/1.3.1/jai-imageio-core-1.3.1-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_0.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.github.jsqlparser:jsqlparser:1.0">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/jsqlparser/jsqlparser/1.0/jsqlparser-1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/jsqlparser/jsqlparser/1.0/jsqlparser-1.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/jsqlparser/jsqlparser/1.0/jsqlparser-1.0-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/github/jsqlparser/jsqlparser/1.0/jsqlparser-1.0.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/github/jsqlparser/jsqlparser/1.0/jsqlparser-1.0-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_4.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.github.pagehelper:pagehelper:5.1.4">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/pagehelper/pagehelper/5.1.4/pagehelper-5.1.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/pagehelper/pagehelper/5.1.4/pagehelper-5.1.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/pagehelper/pagehelper/5.1.4/pagehelper-5.1.4-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/github/pagehelper/pagehelper/5.1.4/pagehelper-5.1.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/github/pagehelper/pagehelper/5.1.4/pagehelper-5.1.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/github/pagehelper/pagehelper/5.1.4/pagehelper-5.1.4-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_5.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.5">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.5/pagehelper-spring-boot-autoconfigure-1.2.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.5/pagehelper-spring-boot-autoconfigure-1.2.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.5/pagehelper-spring-boot-autoconfigure-1.2.5-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.5/pagehelper-spring-boot-autoconfigure-1.2.5.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/github/pagehelper/pagehelper-spring-boot-autoconfigure/1.2.5/pagehelper-spring-boot-autoconfigure-1.2.5-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_5.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.5">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.5/pagehelper-spring-boot-starter-1.2.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.5/pagehelper-spring-boot-starter-1.2.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.5/pagehelper-spring-boot-starter-1.2.5-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.5/pagehelper-spring-boot-starter-1.2.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.5/pagehelper-spring-boot-starter-1.2.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/github/pagehelper/pagehelper-spring-boot-starter/1.2.5/pagehelper-spring-boot-starter-1.2.5-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.github.virtuald:curvesapi:1.04">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/virtuald/curvesapi/1.04/curvesapi-1.04.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/virtuald/curvesapi/1.04/curvesapi-1.04-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/virtuald/curvesapi/1.04/curvesapi-1.04-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/github/virtuald/curvesapi/1.04/curvesapi-1.04.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/github/virtuald/curvesapi/1.04/curvesapi-1.04-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/github/virtuald/curvesapi/1.04/curvesapi-1.04-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_github_vlsi_compactmap_compactmap_1_2_1.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.github.vlsi.compactmap:compactmap:1.2.1">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/vlsi/compactmap/compactmap/1.2.1/compactmap-1.2.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/vlsi/compactmap/compactmap/1.2.1/compactmap-1.2.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/github/vlsi/compactmap/compactmap/1.2.1/compactmap-1.2.1-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/github/vlsi/compactmap/compactmap/1.2.1/compactmap-1.2.1.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/github/vlsi/compactmap/compactmap/1.2.1/compactmap-1.2.1-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_google_code_findbugs_annotations_3_0_1.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.google.code.findbugs:annotations:3.0.1">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/google/code/findbugs/annotations/3.0.1/annotations-3.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/google/code/findbugs/annotations/3.0.1/annotations-3.0.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/google/code/findbugs/annotations/3.0.1/annotations-3.0.1-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/google/code/findbugs/annotations/3.0.1/annotations-3.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/google/code/findbugs/annotations/3.0.1/annotations-3.0.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/google/code/findbugs/annotations/3.0.1/annotations-3.0.1-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_1.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.google.code.findbugs:jsr305:3.0.1">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_google_code_gson_gson_2_8_5.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.google.code.gson:gson:2.8.5">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/google/code/gson/gson/2.8.5/gson-2.8.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/google/code/gson/gson/2.8.5/gson-2.8.5-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/google/code/gson/gson/2.8.5/gson-2.8.5-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_google_guava_guava_20_0.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.google.guava:guava:20.0">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/google/guava/guava/20.0/guava-20.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/google/guava/guava/20.0/guava-20.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/google/guava/guava/20.0/guava-20.0-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/google/guava/guava/20.0/guava-20.0.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/google/guava/guava/20.0/guava-20.0-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_google_inject_guice_4_1_0.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.google.inject:guice:4.1.0">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/google/inject/guice/4.1.0/guice-4.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/google/inject/guice/4.1.0/guice-4.1.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/google/inject/guice/4.1.0/guice-4.1.0-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/google/inject/guice/4.1.0/guice-4.1.0.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/google/inject/guice/4.1.0/guice-4.1.0-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_google_zxing_core_3_3_0.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.google.zxing:core:3.3.0">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/google/zxing/core/3.3.0/core-3.3.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/google/zxing/core/3.3.0/core-3.3.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/google/zxing/core/3.3.0/core-3.3.0-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/google/zxing/core/3.3.0/core-3.3.0.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/google/zxing/core/3.3.0/core-3.3.0-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_google_zxing_javase_3_3_0.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.google.zxing:javase:3.3.0">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/google/zxing/javase/3.3.0/javase-3.3.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/google/zxing/javase/3.3.0/javase-3.3.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/google/zxing/javase/3.3.0/javase-3.3.0-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/google/zxing/javase/3.3.0/javase-3.3.0.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/google/zxing/javase/3.3.0/javase-3.3.0-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.jayway.jsonpath:json-path:2.4.0">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/jayway/jsonpath/json-path/2.4.0/json-path-2.4.0-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.netflix.archaius:archaius-core:0.7.6">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/archaius/archaius-core/0.7.6/archaius-core-0.7.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/archaius/archaius-core/0.7.6/archaius-core-0.7.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/archaius/archaius-core/0.7.6/archaius-core-0.7.6-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/archaius/archaius-core/0.7.6/archaius-core-0.7.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/archaius/archaius-core/0.7.6/archaius-core-0.7.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/archaius/archaius-core/0.7.6/archaius-core-0.7.6-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_9_3.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.netflix.eureka:eureka-client:1.9.3">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/eureka/eureka-client/1.9.3/eureka-client-1.9.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/eureka/eureka-client/1.9.3/eureka-client-1.9.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/eureka/eureka-client/1.9.3/eureka-client-1.9.3-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/eureka/eureka-client/1.9.3/eureka-client-1.9.3.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/eureka/eureka-client/1.9.3/eureka-client-1.9.3-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_9_3.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.netflix.eureka:eureka-core:1.9.3">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/eureka/eureka-core/1.9.3/eureka-core-1.9.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/eureka/eureka-core/1.9.3/eureka-core-1.9.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/eureka/eureka-core/1.9.3/eureka-core-1.9.3-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/eureka/eureka-core/1.9.3/eureka-core-1.9.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/eureka/eureka-core/1.9.3/eureka-core-1.9.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/eureka/eureka-core/1.9.3/eureka-core-1.9.3-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_12.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.netflix.hystrix:hystrix-core:1.5.12">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-core/1.5.12/hystrix-core-1.5.12.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-core/1.5.12/hystrix-core-1.5.12-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-core/1.5.12/hystrix-core-1.5.12-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-core/1.5.12/hystrix-core-1.5.12.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-core/1.5.12/hystrix-core-1.5.12-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_12.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.12">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-javanica/1.5.12/hystrix-javanica-1.5.12.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-javanica/1.5.12/hystrix-javanica-1.5.12-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-javanica/1.5.12/hystrix-javanica-1.5.12-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-javanica/1.5.12/hystrix-javanica-1.5.12.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-javanica/1.5.12/hystrix-javanica-1.5.12-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_12.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.netflix.hystrix:hystrix-metrics-event-stream:1.5.12">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-metrics-event-stream/1.5.12/hystrix-metrics-event-stream-1.5.12.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-metrics-event-stream/1.5.12/hystrix-metrics-event-stream-1.5.12-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-metrics-event-stream/1.5.12/hystrix-metrics-event-stream-1.5.12-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-metrics-event-stream/1.5.12/hystrix-metrics-event-stream-1.5.12.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-metrics-event-stream/1.5.12/hystrix-metrics-event-stream-1.5.12-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_12.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.netflix.hystrix:hystrix-serialization:1.5.12">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-serialization/1.5.12/hystrix-serialization-1.5.12.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-serialization/1.5.12/hystrix-serialization-1.5.12-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-serialization/1.5.12/hystrix-serialization-1.5.12-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-serialization/1.5.12/hystrix-serialization-1.5.12.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/hystrix/hystrix-serialization/1.5.12/hystrix-serialization-1.5.12-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_3_0.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/netflix-commons/netflix-commons-util/0.3.0/netflix-commons-util-0.3.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/netflix-commons/netflix-commons-util/0.3.0/netflix-commons-util-0.3.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/netflix-commons/netflix-commons-util/0.3.0/netflix-commons-util-0.3.0-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/netflix-commons/netflix-commons-util/0.3.0/netflix-commons-util-0.3.0.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/netflix-commons/netflix-commons-util/0.3.0/netflix-commons-util-0.3.0-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_netflix_netflix_commons_netflix_eventbus_0_3_0.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.netflix.netflix-commons:netflix-eventbus:0.3.0">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/netflix-commons/netflix-eventbus/0.3.0/netflix-eventbus-0.3.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/netflix-commons/netflix-eventbus/0.3.0/netflix-eventbus-0.3.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/netflix-commons/netflix-eventbus/0.3.0/netflix-eventbus-0.3.0-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/netflix-commons/netflix-eventbus/0.3.0/netflix-eventbus-0.3.0.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/netflix-commons/netflix-eventbus/0.3.0/netflix-eventbus-0.3.0-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_netflix_netflix_commons_netflix_infix_0_3_0.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.netflix.netflix-commons:netflix-infix:0.3.0">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/netflix-commons/netflix-infix/0.3.0/netflix-infix-0.3.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/netflix-commons/netflix-infix/0.3.0/netflix-infix-0.3.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/netflix-commons/netflix-infix/0.3.0/netflix-infix-0.3.0-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/netflix-commons/netflix-infix/0.3.0/netflix-infix-0.3.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/netflix-commons/netflix-infix/0.3.0/netflix-infix-0.3.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/netflix-commons/netflix-infix/0.3.0/netflix-infix-0.3.0-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/netflix-commons/netflix-statistics/0.1.1/netflix-statistics-0.1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/netflix-commons/netflix-statistics/0.1.1/netflix-statistics-0.1.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/netflix-commons/netflix-statistics/0.1.1/netflix-statistics-0.1.1-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/netflix-commons/netflix-statistics/0.1.1/netflix-statistics-0.1.1.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/netflix-commons/netflix-statistics/0.1.1/netflix-statistics-0.1.1-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_2_5.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.netflix.ribbon:ribbon:2.2.5">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon/2.2.5/ribbon-2.2.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon/2.2.5/ribbon-2.2.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon/2.2.5/ribbon-2.2.5-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon/2.2.5/ribbon-2.2.5.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon/2.2.5/ribbon-2.2.5-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_2_5.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.netflix.ribbon:ribbon-core:2.2.5">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-core/2.2.5/ribbon-core-2.2.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-core/2.2.5/ribbon-core-2.2.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-core/2.2.5/ribbon-core-2.2.5-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-core/2.2.5/ribbon-core-2.2.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-core/2.2.5/ribbon-core-2.2.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-core/2.2.5/ribbon-core-2.2.5-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_2_5.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.netflix.ribbon:ribbon-eureka:2.2.5">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-eureka/2.2.5/ribbon-eureka-2.2.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-eureka/2.2.5/ribbon-eureka-2.2.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-eureka/2.2.5/ribbon-eureka-2.2.5-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-eureka/2.2.5/ribbon-eureka-2.2.5.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-eureka/2.2.5/ribbon-eureka-2.2.5-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_2_5.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.netflix.ribbon:ribbon-httpclient:2.2.5">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-httpclient/2.2.5/ribbon-httpclient-2.2.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-httpclient/2.2.5/ribbon-httpclient-2.2.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-httpclient/2.2.5/ribbon-httpclient-2.2.5-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-httpclient/2.2.5/ribbon-httpclient-2.2.5.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-httpclient/2.2.5/ribbon-httpclient-2.2.5-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_2_5.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.2.5">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-loadbalancer/2.2.5/ribbon-loadbalancer-2.2.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-loadbalancer/2.2.5/ribbon-loadbalancer-2.2.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-loadbalancer/2.2.5/ribbon-loadbalancer-2.2.5-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-loadbalancer/2.2.5/ribbon-loadbalancer-2.2.5.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-loadbalancer/2.2.5/ribbon-loadbalancer-2.2.5-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_2_5.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.netflix.ribbon:ribbon-transport:2.2.5">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-transport/2.2.5/ribbon-transport-2.2.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-transport/2.2.5/ribbon-transport-2.2.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-transport/2.2.5/ribbon-transport-2.2.5-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-transport/2.2.5/ribbon-transport-2.2.5.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-transport/2.2.5/ribbon-transport-2.2.5-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/ribbon/ribbon-transport/2.2.5/ribbon-transport-2.2.5-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.netflix.servo:servo-core:0.12.21">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/servo/servo-core/0.12.21/servo-core-0.12.21.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/servo/servo-core/0.12.21/servo-core-0.12.21-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/netflix/servo/servo-core/0.12.21/servo-core-0.12.21-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/servo/servo-core/0.12.21/servo-core-0.12.21.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/servo/servo-core/0.12.21/servo-core-0.12.21-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/netflix/servo/servo-core/0.12.21/servo-core-0.12.21-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_oracle_ojdbc6_11_2_0_1_0.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.oracle:ojdbc6:11.2.0.1.0">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/oracle/ojdbc6/11.2.0.1.0/ojdbc6-11.2.0.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/oracle/ojdbc6/11.2.0.1.0/ojdbc6-11.2.0.1.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/oracle/ojdbc6/11.2.0.1.0/ojdbc6-11.2.0.1.0-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/oracle/ojdbc6/11.2.0.1.0/ojdbc6-11.2.0.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/oracle/ojdbc6/11.2.0.1.0/ojdbc6-11.2.0.1.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/oracle/ojdbc6/11.2.0.1.0/ojdbc6-11.2.0.1.0-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_8_1.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.squareup.okhttp3:okhttp:3.8.1">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/squareup/okhttp3/okhttp/3.8.1/okhttp-3.8.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/squareup/okhttp3/okhttp/3.8.1/okhttp-3.8.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/squareup/okhttp3/okhttp/3.8.1/okhttp-3.8.1-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/squareup/okhttp3/okhttp/3.8.1/okhttp-3.8.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/squareup/okhttp3/okhttp/3.8.1/okhttp-3.8.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/squareup/okhttp3/okhttp/3.8.1/okhttp-3.8.1-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_squareup_okio_okio_1_13_0.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.squareup.okio:okio:1.13.0">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/squareup/okio/okio/1.13.0/okio-1.13.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/squareup/okio/okio/1.13.0/okio-1.13.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/squareup/okio/okio/1.13.0/okio-1.13.0-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/squareup/okio/okio/1.13.0/okio-1.13.0.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/squareup/okio/okio/1.13.0/okio-1.13.0-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_steerinfo_framework_1_0.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.steerinfo:framework:1.0">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/steerinfo/framework/1.0/framework-1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/steerinfo/framework/1.0/framework-1.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/steerinfo/framework/1.0/framework-1.0-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/steerinfo/framework/1.0/framework-1.0.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/steerinfo/framework/1.0/framework-1.0-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/sun/jersey/contribs/jersey-apache-client4/1.19.1/jersey-apache-client4-1.19.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/sun/jersey/contribs/jersey-apache-client4/1.19.1/jersey-apache-client4-1.19.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/sun/jersey/contribs/jersey-apache-client4/1.19.1/jersey-apache-client4-1.19.1-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/sun/jersey/contribs/jersey-apache-client4/1.19.1/jersey-apache-client4-1.19.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/sun/jersey/contribs/jersey-apache-client4/1.19.1/jersey-apache-client4-1.19.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/sun/jersey/contribs/jersey-apache-client4/1.19.1/jersey-apache-client4-1.19.1-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.sun.jersey:jersey-client:1.19.1">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/sun/jersey/jersey-client/1.19.1/jersey-client-1.19.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/sun/jersey/jersey-client/1.19.1/jersey-client-1.19.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/sun/jersey/jersey-client/1.19.1/jersey-client-1.19.1-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/sun/jersey/jersey-client/1.19.1/jersey-client-1.19.1.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/sun/jersey/jersey-client/1.19.1/jersey-client-1.19.1-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.sun.jersey:jersey-core:1.19.1">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/sun/jersey/jersey-core/1.19.1/jersey-core-1.19.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/sun/jersey/jersey-core/1.19.1/jersey-core-1.19.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/sun/jersey/jersey-core/1.19.1/jersey-core-1.19.1-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/sun/jersey/jersey-core/1.19.1/jersey-core-1.19.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/sun/jersey/jersey-core/1.19.1/jersey-core-1.19.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/sun/jersey/jersey-core/1.19.1/jersey-core-1.19.1-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_10.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.thoughtworks.xstream:xstream:1.4.10">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/thoughtworks/xstream/xstream/1.4.10/xstream-1.4.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/thoughtworks/xstream/xstream/1.4.10/xstream-1.4.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/thoughtworks/xstream/xstream/1.4.10/xstream-1.4.10-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/thoughtworks/xstream/xstream/1.4.10/xstream-1.4.10.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/thoughtworks/xstream/xstream/1.4.10/xstream-1.4.10-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/thoughtworks/xstream/xstream/1.4.10/xstream-1.4.10-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: com.zaxxer:HikariCP:2.7.9">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/zaxxer/HikariCP/2.7.9/HikariCP-2.7.9.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/zaxxer/HikariCP/2.7.9/HikariCP-2.7.9-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/com/zaxxer/HikariCP/2.7.9/HikariCP-2.7.9-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/zaxxer/HikariCP/2.7.9/HikariCP-2.7.9.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/com/zaxxer/HikariCP/2.7.9/HikariCP-2.7.9-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-beanutils:commons-beanutils:1.9.3">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-beanutils/commons-beanutils/1.9.3/commons-beanutils-1.9.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-beanutils/commons-beanutils/1.9.3/commons-beanutils-1.9.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-beanutils/commons-beanutils/1.9.3/commons-beanutils-1.9.3-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/commons-beanutils/commons-beanutils/1.9.3/commons-beanutils-1.9.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/commons-beanutils/commons-beanutils/1.9.3/commons-beanutils-1.9.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/commons-beanutils/commons-beanutils/1.9.3/commons-beanutils-1.9.3-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-codec:commons-codec:1.11">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-codec/commons-codec/1.11/commons-codec-1.11.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-codec/commons-codec/1.11/commons-codec-1.11-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-codec/commons-codec/1.11/commons-codec-1.11-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/commons-codec/commons-codec/1.11/commons-codec-1.11.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/commons-codec/commons-codec/1.11/commons-codec-1.11-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/commons-codec/commons-codec/1.11/commons-codec-1.11-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-collections:commons-collections:3.2.2">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: commons-configuration:commons-configuration:1.8">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-configuration/commons-configuration/1.8/commons-configuration-1.8.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-configuration/commons-configuration/1.8/commons-configuration-1.8-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-configuration/commons-configuration/1.8/commons-configuration-1.8-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/commons-configuration/commons-configuration/1.8/commons-configuration-1.8.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/commons-configuration/commons-configuration/1.8/commons-configuration-1.8-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: commons-fileupload:commons-fileupload:1.3.3">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/commons-fileupload/commons-fileupload/1.3.3/commons-fileupload-1.3.3-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__commons_io_commons_io_2_2.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-io:commons-io:2.2">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-io/commons-io/2.2/commons-io-2.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-io/commons-io/2.2/commons-io-2.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-io/commons-io/2.2/commons-io-2.2-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/commons-io/commons-io/2.2/commons-io-2.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/commons-io/commons-io/2.2/commons-io-2.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/commons-io/commons-io/2.2/commons-io-2.2-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__commons_jxpath_commons_jxpath_1_3.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: commons-jxpath:commons-jxpath:1.3">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-jxpath/commons-jxpath/1.3/commons-jxpath-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-jxpath/commons-jxpath/1.3/commons-jxpath-1.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-jxpath/commons-jxpath/1.3/commons-jxpath-1.3-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/commons-jxpath/commons-jxpath/1.3/commons-jxpath-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/commons-jxpath/commons-jxpath/1.3/commons-jxpath-1.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/commons-jxpath/commons-jxpath/1.3/commons-jxpath-1.3-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: commons-lang:commons-lang:2.6">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-lang/commons-lang/2.6/commons-lang-2.6.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-lang/commons-lang/2.6/commons-lang-2.6-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/commons-lang/commons-lang/2.6/commons-lang-2.6-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/commons-lang/commons-lang/2.6/commons-lang-2.6.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/commons-lang/commons-lang/2.6/commons-lang-2.6-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: dom4j:dom4j:1.6.1">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/dom4j/dom4j/1.6.1/dom4j-1.6.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/dom4j/dom4j/1.6.1/dom4j-1.6.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__io_github_openfeign_feign_core_9_7_0.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: io.github.openfeign:feign-core:9.7.0">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-core/9.7.0/feign-core-9.7.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-core/9.7.0/feign-core-9.7.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-core/9.7.0/feign-core-9.7.0-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-core/9.7.0/feign-core-9.7.0.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-core/9.7.0/feign-core-9.7.0-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__io_github_openfeign_feign_httpclient_9_7_0.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: io.github.openfeign:feign-httpclient:9.7.0">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-httpclient/9.7.0/feign-httpclient-9.7.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-httpclient/9.7.0/feign-httpclient-9.7.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-httpclient/9.7.0/feign-httpclient-9.7.0-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-httpclient/9.7.0/feign-httpclient-9.7.0.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-httpclient/9.7.0/feign-httpclient-9.7.0-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_7_0.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: io.github.openfeign:feign-hystrix:9.7.0">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-hystrix/9.7.0/feign-hystrix-9.7.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-hystrix/9.7.0/feign-hystrix-9.7.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-hystrix/9.7.0/feign-hystrix-9.7.0-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-hystrix/9.7.0/feign-hystrix-9.7.0.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-hystrix/9.7.0/feign-hystrix-9.7.0-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__io_github_openfeign_feign_java8_9_7_0.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: io.github.openfeign:feign-java8:9.7.0">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-java8/9.7.0/feign-java8-9.7.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-java8/9.7.0/feign-java8-9.7.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-java8/9.7.0/feign-java8-9.7.0-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-java8/9.7.0/feign-java8-9.7.0.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-java8/9.7.0/feign-java8-9.7.0-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_7_0.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: io.github.openfeign:feign-slf4j:9.7.0">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-slf4j/9.7.0/feign-slf4j-9.7.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-slf4j/9.7.0/feign-slf4j-9.7.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-slf4j/9.7.0/feign-slf4j-9.7.0-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-slf4j/9.7.0/feign-slf4j-9.7.0.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/github/openfeign/feign-slf4j/9.7.0/feign-slf4j-9.7.0-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_3_0.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: io.github.openfeign.form:feign-form:3.3.0">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/github/openfeign/form/feign-form/3.3.0/feign-form-3.3.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/github/openfeign/form/feign-form/3.3.0/feign-form-3.3.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/github/openfeign/form/feign-form/3.3.0/feign-form-3.3.0-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/github/openfeign/form/feign-form/3.3.0/feign-form-3.3.0.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/github/openfeign/form/feign-form/3.3.0/feign-form-3.3.0-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_3_0.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: io.github.openfeign.form:feign-form-spring:3.3.0">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/github/openfeign/form/feign-form-spring/3.3.0/feign-form-spring-3.3.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/github/openfeign/form/feign-form-spring/3.3.0/feign-form-spring-3.3.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/github/openfeign/form/feign-form-spring/3.3.0/feign-form-spring-3.3.0-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/github/openfeign/form/feign-form-spring/3.3.0/feign-form-spring-3.3.0.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/github/openfeign/form/feign-form-spring/3.3.0/feign-form-spring-3.3.0-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_7_0.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: io.jsonwebtoken:jjwt:0.7.0">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/jsonwebtoken/jjwt/0.7.0/jjwt-0.7.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/jsonwebtoken/jjwt/0.7.0/jjwt-0.7.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/jsonwebtoken/jjwt/0.7.0/jjwt-0.7.0-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/jsonwebtoken/jjwt/0.7.0/jjwt-0.7.0.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/jsonwebtoken/jjwt/0.7.0/jjwt-0.7.0-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__io_micrometer_micrometer_core_1_0_8.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: io.micrometer:micrometer-core:1.0.8">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/micrometer/micrometer-core/1.0.8/micrometer-core-1.0.8.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/micrometer/micrometer-core/1.0.8/micrometer-core-1.0.8-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/micrometer/micrometer-core/1.0.8/micrometer-core-1.0.8-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/micrometer/micrometer-core/1.0.8/micrometer-core-1.0.8.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/micrometer/micrometer-core/1.0.8/micrometer-core-1.0.8-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: io.reactivex:rxjava:1.3.8">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/reactivex/rxjava/1.3.8/rxjava-1.3.8.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/reactivex/rxjava/1.3.8/rxjava-1.3.8-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/reactivex/rxjava/1.3.8/rxjava-1.3.8-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/reactivex/rxjava/1.3.8/rxjava-1.3.8.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/reactivex/rxjava/1.3.8/rxjava-1.3.8-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/reactivex/rxjava/1.3.8/rxjava-1.3.8-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: io.reactivex:rxjava-reactive-streams:1.2.1">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/reactivex/rxjava-reactive-streams/1.2.1/rxjava-reactive-streams-1.2.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/reactivex/rxjava-reactive-streams/1.2.1/rxjava-reactive-streams-1.2.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/reactivex/rxjava-reactive-streams/1.2.1/rxjava-reactive-streams-1.2.1-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/reactivex/rxjava-reactive-streams/1.2.1/rxjava-reactive-streams-1.2.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/reactivex/rxjava-reactive-streams/1.2.1/rxjava-reactive-streams-1.2.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/reactivex/rxjava-reactive-streams/1.2.1/rxjava-reactive-streams-1.2.1-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: io.reactivex:rxnetty:0.4.9">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/reactivex/rxnetty/0.4.9/rxnetty-0.4.9.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/reactivex/rxnetty/0.4.9/rxnetty-0.4.9-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/reactivex/rxnetty/0.4.9/rxnetty-0.4.9-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/reactivex/rxnetty/0.4.9/rxnetty-0.4.9.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/reactivex/rxnetty/0.4.9/rxnetty-0.4.9-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/reactivex/rxnetty/0.4.9/rxnetty-0.4.9-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: io.reactivex:rxnetty-contexts:0.4.9">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/reactivex/rxnetty-contexts/0.4.9/rxnetty-contexts-0.4.9.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/reactivex/rxnetty-contexts/0.4.9/rxnetty-contexts-0.4.9-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/reactivex/rxnetty-contexts/0.4.9/rxnetty-contexts-0.4.9-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/reactivex/rxnetty-contexts/0.4.9/rxnetty-contexts-0.4.9.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/reactivex/rxnetty-contexts/0.4.9/rxnetty-contexts-0.4.9-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: io.reactivex:rxnetty-servo:0.4.9">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/reactivex/rxnetty-servo/0.4.9/rxnetty-servo-0.4.9.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/reactivex/rxnetty-servo/0.4.9/rxnetty-servo-0.4.9-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/reactivex/rxnetty-servo/0.4.9/rxnetty-servo-0.4.9-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/reactivex/rxnetty-servo/0.4.9/rxnetty-servo-0.4.9.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/reactivex/rxnetty-servo/0.4.9/rxnetty-servo-0.4.9-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/reactivex/rxnetty-servo/0.4.9/rxnetty-servo-0.4.9-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: io.springfox:springfox-core:2.9.2">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/springfox/springfox-core/2.9.2/springfox-core-2.9.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/springfox/springfox-core/2.9.2/springfox-core-2.9.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/springfox/springfox-core/2.9.2/springfox-core-2.9.2-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/springfox/springfox-core/2.9.2/springfox-core-2.9.2.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/springfox/springfox-core/2.9.2/springfox-core-2.9.2-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: io.springfox:springfox-schema:2.9.2">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/springfox/springfox-schema/2.9.2/springfox-schema-2.9.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/springfox/springfox-schema/2.9.2/springfox-schema-2.9.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/springfox/springfox-schema/2.9.2/springfox-schema-2.9.2-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/springfox/springfox-schema/2.9.2/springfox-schema-2.9.2.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/springfox/springfox-schema/2.9.2/springfox-schema-2.9.2-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: io.springfox:springfox-spi:2.9.2">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/springfox/springfox-spi/2.9.2/springfox-spi-2.9.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/springfox/springfox-spi/2.9.2/springfox-spi-2.9.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/springfox/springfox-spi/2.9.2/springfox-spi-2.9.2-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/springfox/springfox-spi/2.9.2/springfox-spi-2.9.2.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/springfox/springfox-spi/2.9.2/springfox-spi-2.9.2-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: io.springfox:springfox-spring-web:2.9.2">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/springfox/springfox-spring-web/2.9.2/springfox-spring-web-2.9.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/springfox/springfox-spring-web/2.9.2/springfox-spring-web-2.9.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/springfox/springfox-spring-web/2.9.2/springfox-spring-web-2.9.2-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/springfox/springfox-spring-web/2.9.2/springfox-spring-web-2.9.2.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/springfox/springfox-spring-web/2.9.2/springfox-spring-web-2.9.2-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-swagger2:2.9.2">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/springfox/springfox-swagger2/2.9.2/springfox-swagger2-2.9.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/springfox/springfox-swagger2/2.9.2/springfox-swagger2-2.9.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/springfox/springfox-swagger2/2.9.2/springfox-swagger2-2.9.2-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/springfox/springfox-swagger2/2.9.2/springfox-swagger2-2.9.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/springfox/springfox-swagger2/2.9.2/springfox-swagger2-2.9.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/springfox/springfox-swagger2/2.9.2/springfox-swagger2-2.9.2-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: io.springfox:springfox-swagger-common:2.9.2">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/springfox/springfox-swagger-common/2.9.2/springfox-swagger-common-2.9.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/springfox/springfox-swagger-common/2.9.2/springfox-swagger-common-2.9.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/springfox/springfox-swagger-common/2.9.2/springfox-swagger-common-2.9.2-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/springfox/springfox-swagger-common/2.9.2/springfox-swagger-common-2.9.2.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/springfox/springfox-swagger-common/2.9.2/springfox-swagger-common-2.9.2-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>

.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-swagger-ui:2.9.2">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/springfox/springfox-swagger-ui/2.9.2/springfox-swagger-ui-2.9.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/springfox/springfox-swagger-ui/2.9.2/springfox-swagger-ui-2.9.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/springfox/springfox-swagger-ui/2.9.2/springfox-swagger-ui-2.9.2-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/springfox/springfox-swagger-ui/2.9.2/springfox-swagger-ui-2.9.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/springfox/springfox-swagger-ui/2.9.2/springfox-swagger-ui-2.9.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/springfox/springfox-swagger-ui/2.9.2/springfox-swagger-ui-2.9.2-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml

@@ -1,23 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: io.swagger:swagger-annotations:1.5.20">
-    <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/swagger/swagger-annotations/1.5.20/swagger-annotations-1.5.20.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/swagger/swagger-annotations/1.5.20/swagger-annotations-1.5.20-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/swagger/swagger-annotations/1.5.20/swagger-annotations-1.5.20-sources.jar!/" />
-=======
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/swagger/swagger-annotations/1.5.20/swagger-annotations-1.5.20.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/swagger/swagger-annotations/1.5.20/swagger-annotations-1.5.20-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/swagger/swagger-annotations/1.5.20/swagger-annotations-1.5.20-sources.jar!/" />
->>>>>>> master
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml

@@ -1,15 +1,6 @@
 <component name="libraryTable">
   <library name="Maven: io.swagger:swagger-models:1.5.20">
     <CLASSES>
-<<<<<<< HEAD
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/swagger/swagger-models/1.5.20/swagger-models-1.5.20.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/swagger/swagger-models/1.5.20/swagger-models-1.5.20-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/../../../apache-maven-3.6.3/cangku/io/swagger/swagger-models/1.5.20/swagger-models-1.5.20-sources.jar!/" />
-=======
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/swagger/swagger-models/1.5.20/swagger-models-1.5.20.jar!/" />
     </CLASSES>
     <JAVADOC>
@@ -17,7 +8,6 @@
     </JAVADOC>
     <SOURCES>
       <root url="jar://$PROJECT_DIR$/../../../../apache-maven-3.6.3/cangku/io/swagger/swagger-models/1.5.20/swagger-models-1.5.20-sources.jar!/" />
->>>>>>> master
     </SOURCES>
   </library>
 </component>