解决合并冲突

5 months ago · 7e41d6ef31
parent 9d106862e3
commit 7e41d6ef31
93 changed files with 1209 additions and 5 deletions
--- a/.idea/libraries/Maven__cglib_cglib_3_1.xml
+++ b/.idea/libraries/Maven__cglib_cglib_3_1.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: cglib:cglib:3.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/cglib/cglib/3.1/cglib-3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/cglib/cglib/3.1/cglib-3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/cglib/cglib/3.1/cglib-3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__cn_afterturn_easypoi_annotation_4_1_3.xml
+++ b/.idea/libraries/Maven__cn_afterturn_easypoi_annotation_4_1_3.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: cn.afterturn:easypoi-annotation:4.1.3">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/cn/afterturn/easypoi-annotation/4.1.3/easypoi-annotation-4.1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/cn/afterturn/easypoi-annotation/4.1.3/easypoi-annotation-4.1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/cn/afterturn/easypoi-annotation/4.1.3/easypoi-annotation-4.1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__cn_afterturn_easypoi_base_4_1_3.xml
+++ b/.idea/libraries/Maven__cn_afterturn_easypoi_base_4_1_3.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: cn.afterturn:easypoi-base:4.1.3">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/cn/afterturn/easypoi-base/4.1.3/easypoi-base-4.1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/cn/afterturn/easypoi-base/4.1.3/easypoi-base-4.1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/cn/afterturn/easypoi-base/4.1.3/easypoi-base-4.1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__cn_afterturn_easypoi_spring_boot_starter_4_2_0.xml
+++ b/.idea/libraries/Maven__cn_afterturn_easypoi_spring_boot_starter_4_2_0.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: cn.afterturn:easypoi-spring-boot-starter:4.2.0">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/cn/afterturn/easypoi-spring-boot-starter/4.2.0/easypoi-spring-boot-starter-4.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/cn/afterturn/easypoi-spring-boot-starter/4.2.0/easypoi-spring-boot-starter-4.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/cn/afterturn/easypoi-spring-boot-starter/4.2.0/easypoi-spring-boot-starter-4.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__cn_afterturn_easypoi_web_4_1_3.xml
+++ b/.idea/libraries/Maven__cn_afterturn_easypoi_web_4_1_3.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: cn.afterturn:easypoi-web:4.1.3">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/cn/afterturn/easypoi-web/4.1.3/easypoi-web-4.1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/cn/afterturn/easypoi-web/4.1.3/easypoi-web-4.1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/cn/afterturn/easypoi-web/4.1.3/easypoi-web-4.1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_alibaba_easyexcel_2_1_1.xml
+++ b/.idea/libraries/Maven__com_alibaba_easyexcel_2_1_1.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.alibaba:easyexcel:2.1.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/alibaba/easyexcel/2.1.1/easyexcel-2.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/alibaba/easyexcel/2.1.1/easyexcel-2.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/alibaba/easyexcel/2.1.1/easyexcel-2.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_ecs_4_2_0.xml
+++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_ecs_4_2_0.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.aliyun:aliyun-java-sdk-ecs:4.2.0">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/aliyun/aliyun-java-sdk-ecs/4.2.0/aliyun-java-sdk-ecs-4.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/aliyun/aliyun-java-sdk-ecs/4.2.0/aliyun-java-sdk-ecs-4.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/aliyun/aliyun-java-sdk-ecs/4.2.0/aliyun-java-sdk-ecs-4.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_ram_3_0_0.xml
+++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_ram_3_0_0.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.aliyun:aliyun-java-sdk-ram:3.0.0">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/aliyun/aliyun-java-sdk-ram/3.0.0/aliyun-java-sdk-ram-3.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/aliyun/aliyun-java-sdk-ram/3.0.0/aliyun-java-sdk-ram-3.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/aliyun/aliyun-java-sdk-ram/3.0.0/aliyun-java-sdk-ram-3.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_sts_3_0_0.xml
+++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_sts_3_0_0.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.aliyun:aliyun-java-sdk-sts:3.0.0">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/aliyun/aliyun-java-sdk-sts/3.0.0/aliyun-java-sdk-sts-3.0.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/aliyun/aliyun-java-sdk-sts/3.0.0/aliyun-java-sdk-sts-3.0.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/aliyun/aliyun-java-sdk-sts/3.0.0/aliyun-java-sdk-sts-3.0.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_vod_2_15_2.xml
+++ b/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_vod_2_15_2.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.aliyun:aliyun-java-sdk-vod:2.15.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/aliyun/aliyun-java-sdk-vod/2.15.2/aliyun-java-sdk-vod-2.15.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/aliyun/aliyun-java-sdk-vod/2.15.2/aliyun-java-sdk-vod-2.15.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/aliyun/aliyun-java-sdk-vod/2.15.2/aliyun-java-sdk-vod-2.15.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_3_1_0.xml
+++ b/.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_3_1_0.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.1.0">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/aliyun/oss/aliyun-sdk-oss/3.1.0/aliyun-sdk-oss-3.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/aliyun/oss/aliyun-sdk-oss/3.1.0/aliyun-sdk-oss-3.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/aliyun/oss/aliyun-sdk-oss/3.1.0/aliyun-sdk-oss-3.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_baomidou_dynamic_datasource_spring_boot_starter_3_3_2.xml
+++ b/.idea/libraries/Maven__com_baomidou_dynamic_datasource_spring_boot_starter_3_3_2.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:3.3.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/baomidou/dynamic-datasource-spring-boot-starter/3.3.2/dynamic-datasource-spring-boot-starter-3.3.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/baomidou/dynamic-datasource-spring-boot-starter/3.3.2/dynamic-datasource-spring-boot-starter-3.3.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/baomidou/dynamic-datasource-spring-boot-starter/3.3.2/dynamic-datasource-spring-boot-starter-3.3.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_0_5.xml
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_0_5.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:mybatis-plus-annotation:3.0.5">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/baomidou/mybatis-plus-annotation/3.0.5/mybatis-plus-annotation-3.0.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/baomidou/mybatis-plus-annotation/3.0.5/mybatis-plus-annotation-3.0.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/baomidou/mybatis-plus-annotation/3.0.5/mybatis-plus-annotation-3.0.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_0_5.xml
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_0_5.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:mybatis-plus-core:3.0.5">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/baomidou/mybatis-plus-core/3.0.5/mybatis-plus-core-3.0.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/baomidou/mybatis-plus-core/3.0.5/mybatis-plus-core-3.0.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/baomidou/mybatis-plus-core/3.0.5/mybatis-plus-core-3.0.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_0_5.xml
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_0_5.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:mybatis-plus-extension:3.0.5">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/baomidou/mybatis-plus-extension/3.0.5/mybatis-plus-extension-3.0.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/baomidou/mybatis-plus-extension/3.0.5/mybatis-plus-extension-3.0.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/baomidou/mybatis-plus-extension/3.0.5/mybatis-plus-extension-3.0.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_0_5.xml
+++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_0_5.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.baomidou:mybatis-plus-generator:3.0.5">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/baomidou/mybatis-plus-generator/3.0.5/mybatis-plus-generator-3.0.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/baomidou/mybatis-plus-generator/3.0.5/mybatis-plus-generator-3.0.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/baomidou/mybatis-plus-generator/3.0.5/mybatis-plus-generator-3.0.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml
+++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml:classmate:1.5.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/fasterxml/classmate/1.5.1/classmate-1.5.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/fasterxml/classmate/1.5.1/classmate-1.5.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/fasterxml/classmate/1.5.1/classmate-1.5.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_2.xml
+++ b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_2.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.jsqlparser:jsqlparser:1.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/github/jsqlparser/jsqlparser/1.2/jsqlparser-1.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_05.xml
+++ b/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_05.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.virtuald:curvesapi:1.05">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/github/virtuald/curvesapi/1.05/curvesapi-1.05.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/github/virtuald/curvesapi/1.05/curvesapi-1.05-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/github/virtuald/curvesapi/1.05/curvesapi-1.05-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_github_whvcse_easy_captcha_1_6_2.xml
+++ b/.idea/libraries/Maven__com_github_whvcse_easy_captcha_1_6_2.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.whvcse:easy-captcha:1.6.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/github/whvcse/easy-captcha/1.6.2/easy-captcha-1.6.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/github/whvcse/easy-captcha/1.6.2/easy-captcha-1.6.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/github/whvcse/easy-captcha/1.6.2/easy-captcha-1.6.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_github_xiaoymin_swagger_bootstrap_ui_1_9_3.xml
+++ b/.idea/libraries/Maven__com_github_xiaoymin_swagger_bootstrap_ui_1_9_3.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.xiaoymin:swagger-bootstrap-ui:1.9.3">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/github/xiaoymin/swagger-bootstrap-ui/1.9.3/swagger-bootstrap-ui-1.9.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/github/xiaoymin/swagger-bootstrap-ui/1.9.3/swagger-bootstrap-ui-1.9.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/github/xiaoymin/swagger-bootstrap-ui/1.9.3/swagger-bootstrap-ui-1.9.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_2.xml
+++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_2.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.code.gson:gson:2.8.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/google/code/gson/gson/2.8.2/gson-2.8.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/google/code/gson/gson/2.8.2/gson-2.8.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/google/code/gson/gson/2.8.2/gson-2.8.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_google_zxing_core_3_2_0.xml
+++ b/.idea/libraries/Maven__com_google_zxing_core_3_2_0.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.zxing:core:3.2.0">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/google/zxing/core/3.2.0/core-3.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/google/zxing/core/3.2.0/core-3.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/google/zxing/core/3.2.0/core-3.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_google_zxing_javase_3_2_0.xml
+++ b/.idea/libraries/Maven__com_google_zxing_javase_3_2_0.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.zxing:javase:3.2.0">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/google/zxing/javase/3.2.0/javase-3.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/google/zxing/javase/3.2.0/javase-3.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/google/zxing/javase/3.2.0/javase-3.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml
+++ b/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.sun.activation:jakarta.activation:1.2.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_9.xml
+++ b/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_9.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.sun.jersey:jersey-core:1.9">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/sun/jersey/jersey-core/1.9/jersey-core-1.9.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/sun/jersey/jersey-core/1.9/jersey-core-1.9-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/sun/jersey/jersey-core/1.9/jersey-core-1.9-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_sun_jersey_jersey_json_1_9.xml
+++ b/.idea/libraries/Maven__com_sun_jersey_jersey_json_1_9.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.sun.jersey:jersey-json:1.9">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/sun/jersey/jersey-json/1.9/jersey-json-1.9.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/sun/jersey/jersey-json/1.9/jersey-json-1.9-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/sun/jersey/jersey-json/1.9/jersey-json-1.9-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_2_3_1.xml
+++ b/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_2_3_1.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.sun.xml.bind:jaxb-impl:2.2.3-1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/sun/xml/bind/jaxb-impl/2.2.3-1/jaxb-impl-2.2.3-1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/sun/xml/bind/jaxb-impl/2.2.3-1/jaxb-impl-2.2.3-1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/sun/xml/bind/jaxb-impl/2.2.3-1/jaxb-impl-2.2.3-1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
+++ b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/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$/../../maven/maven-repository/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__commons_io_commons_io_2_6.xml
+++ b/.idea/libraries/Maven__commons_io_commons_io_2_6.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-io:commons-io:2.6">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/commons-io/commons-io/2.6/commons-io-2.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/commons-io/commons-io/2.6/commons-io-2.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/commons-io/commons-io/2.6/commons-io-2.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml
+++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-lang:commons-lang:2.6">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/commons-lang/commons-lang/2.6/commons-lang-2.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/commons-lang/commons-lang/2.6/commons-lang-2.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/commons-lang/commons-lang/2.6/commons-lang-2.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_7_0.xml
+++ b/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_7_0.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.jsonwebtoken:jjwt:0.7.0">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/jsonwebtoken/jjwt/0.7.0/jjwt-0.7.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/jsonwebtoken/jjwt/0.7.0/jjwt-0.7.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/jsonwebtoken/jjwt/0.7.0/jjwt-0.7.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml
+++ b/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-core:2.9.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/springfox/springfox-core/2.9.2/springfox-core-2.9.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/springfox/springfox-core/2.9.2/springfox-core-2.9.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/springfox/springfox-core/2.9.2/springfox-core-2.9.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml
+++ b/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-schema:2.9.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/springfox/springfox-schema/2.9.2/springfox-schema-2.9.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/springfox/springfox-schema/2.9.2/springfox-schema-2.9.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/springfox/springfox-schema/2.9.2/springfox-schema-2.9.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml
+++ b/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-spi:2.9.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/springfox/springfox-spi/2.9.2/springfox-spi-2.9.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/springfox/springfox-spi/2.9.2/springfox-spi-2.9.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/springfox/springfox-spi/2.9.2/springfox-spi-2.9.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml
+++ b/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-spring-web:2.9.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/springfox/springfox-spring-web/2.9.2/springfox-spring-web-2.9.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/springfox/springfox-spring-web/2.9.2/springfox-spring-web-2.9.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/springfox/springfox-spring-web/2.9.2/springfox-spring-web-2.9.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml
+++ b/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-swagger2:2.9.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/springfox/springfox-swagger2/2.9.2/springfox-swagger2-2.9.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/springfox/springfox-swagger2/2.9.2/springfox-swagger2-2.9.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/springfox/springfox-swagger2/2.9.2/springfox-swagger2-2.9.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml
+++ b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-swagger-common:2.9.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/springfox/springfox-swagger-common/2.9.2/springfox-swagger-common-2.9.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/springfox/springfox-swagger-common/2.9.2/springfox-swagger-common-2.9.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/springfox/springfox-swagger-common/2.9.2/springfox-swagger-common-2.9.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml
+++ b/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.springfox:springfox-swagger-ui:2.9.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/springfox/springfox-swagger-ui/2.9.2/springfox-swagger-ui-2.9.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/springfox/springfox-swagger-ui/2.9.2/springfox-swagger-ui-2.9.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/springfox/springfox-swagger-ui/2.9.2/springfox-swagger-ui-2.9.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_21.xml
+++ b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_21.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.swagger:swagger-annotations:1.5.21">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/swagger/swagger-annotations/1.5.21/swagger-annotations-1.5.21.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/swagger/swagger-annotations/1.5.21/swagger-annotations-1.5.21-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/swagger/swagger-annotations/1.5.21/swagger-annotations-1.5.21-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_21.xml
+++ b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_21.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.swagger:swagger-models:1.5.21">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/swagger/swagger-models/1.5.21/swagger-models-1.5.21.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/swagger/swagger-models/1.5.21/swagger-models-1.5.21-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/io/swagger/swagger-models/1.5.21/swagger-models-1.5.21-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml
+++ b/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: jakarta.activation:jakarta.activation-api:1.2.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
+++ b/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/jakarta/annotation/jakarta.annotation-api/1.3.5/jakarta.annotation-api-1.3.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml
+++ b/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__javax_activation_activation_1_1_1.xml
+++ b/.idea/libraries/Maven__javax_activation_activation_1_1_1.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.activation:activation:1.1.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/javax/activation/activation/1.1.1/activation-1.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/javax/activation/activation/1.1.1/activation-1.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/javax/activation/activation/1.1.1/activation-1.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml
+++ b/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.activation:javax.activation-api:1.2.0">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__javax_mail_mail_1_4_5.xml
+++ b/.idea/libraries/Maven__javax_mail_mail_1_4_5.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.mail:mail:1.4.5">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/javax/mail/mail/1.4.5/mail-1.4.5.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/javax/mail/mail/1.4.5/mail-1.4.5-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/javax/mail/mail/1.4.5/mail-1.4.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml
+++ b/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.validation:validation-api:2.0.1.Final">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml
+++ b/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.xml.bind:jaxb-api:2.3.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__ognl_ognl_3_2_6.xml
+++ b/.idea/libraries/Maven__ognl_ognl_3_2_6.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: ognl:ognl:3.2.6">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/ognl/ognl/3.2.6/ognl-3.2.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/ognl/ognl/3.2.6/ognl-3.2.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/ognl/ognl/3.2.6/ognl-3.2.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_2.xml
+++ b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_2.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-collections4:4.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/commons/commons-collections4/4.2/commons-collections4-4.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/commons/commons-collections4/4.2/commons-collections4-4.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/commons/commons-collections4/4.2/commons-collections4-4.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_apache_commons_commons_compress_1_18.xml
+++ b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_18.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-compress:1.18">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/commons/commons-compress/1.18/commons-compress-1.18-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/commons/commons-compress/1.18/commons-compress-1.18-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_apache_commons_commons_email_1_3_3.xml
+++ b/.idea/libraries/Maven__org_apache_commons_commons_email_1_3_3.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-email:1.3.3">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/commons/commons-email/1.3.3/commons-email-1.3.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/commons/commons-email/1.3.3/commons-email-1.3.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/commons/commons-email/1.3.3/commons-email-1.3.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml
+++ b/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-math3:3.6.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_apache_poi_poi_4_0_1.xml
+++ b/.idea/libraries/Maven__org_apache_poi_poi_4_0_1.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.poi:poi:4.0.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/poi/poi/4.0.1/poi-4.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/poi/poi/4.0.1/poi-4.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/poi/poi/4.0.1/poi-4.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_0_1.xml
+++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_0_1.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.poi:poi-ooxml:4.0.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/poi/poi-ooxml/4.0.1/poi-ooxml-4.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/poi/poi-ooxml/4.0.1/poi-ooxml-4.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/poi/poi-ooxml/4.0.1/poi-ooxml-4.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_0_1.xml
+++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_0_1.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.poi:poi-ooxml-schemas:4.0.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/poi/poi-ooxml-schemas/4.0.1/poi-ooxml-schemas-4.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/poi/poi-ooxml-schemas/4.0.1/poi-ooxml-schemas-4.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/poi/poi-ooxml-schemas/4.0.1/poi-ooxml-schemas-4.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_0.xml
+++ b/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_0.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.velocity:velocity-engine-core:2.0">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/velocity/velocity-engine-core/2.0/velocity-engine-core-2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/velocity/velocity-engine-core/2.0/velocity-engine-core-2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/velocity/velocity-engine-core/2.0/velocity-engine-core-2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_0_2.xml
+++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_0_2.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.xmlbeans:xmlbeans:3.0.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/xmlbeans/xmlbeans/3.0.2/xmlbeans-3.0.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/xmlbeans/xmlbeans/3.0.2/xmlbeans-3.0.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/apache/xmlbeans/xmlbeans/3.0.2/xmlbeans-3.0.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_8_3.xml
+++ b/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_8_3.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.jackson:jackson-core-asl:1.8.3">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/codehaus/jackson/jackson-core-asl/1.8.3/jackson-core-asl-1.8.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/codehaus/jackson/jackson-core-asl/1.8.3/jackson-core-asl-1.8.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/codehaus/jackson/jackson-core-asl/1.8.3/jackson-core-asl-1.8.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_codehaus_jackson_jackson_jaxrs_1_8_3.xml
+++ b/.idea/libraries/Maven__org_codehaus_jackson_jackson_jaxrs_1_8_3.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.jackson:jackson-jaxrs:1.8.3">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/codehaus/jackson/jackson-jaxrs/1.8.3/jackson-jaxrs-1.8.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/codehaus/jackson/jackson-jaxrs/1.8.3/jackson-jaxrs-1.8.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/codehaus/jackson/jackson-jaxrs/1.8.3/jackson-jaxrs-1.8.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_8_3.xml
+++ b/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_8_3.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.8.3">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/codehaus/jackson/jackson-mapper-asl/1.8.3/jackson-mapper-asl-1.8.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/codehaus/jackson/jackson-mapper-asl/1.8.3/jackson-mapper-asl-1.8.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/codehaus/jackson/jackson-mapper-asl/1.8.3/jackson-mapper-asl-1.8.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_codehaus_jackson_jackson_xc_1_8_3.xml
+++ b/.idea/libraries/Maven__org_codehaus_jackson_jackson_xc_1_8_3.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.jackson:jackson-xc:1.8.3">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/codehaus/jackson/jackson-xc/1.8.3/jackson-xc-1.8.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/codehaus/jackson/jackson-xc/1.8.3/jackson-xc-1.8.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/codehaus/jackson/jackson-xc/1.8.3/jackson-xc-1.8.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_1.xml
+++ b/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_1.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.codehaus.jettison:jettison:1.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/codehaus/jettison/jettison/1.1/jettison-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/codehaus/jettison/jettison/1.1/jettison-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/codehaus/jettison/jettison/1.1/jettison-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_freemarker_freemarker_2_3_28.xml
+++ b/.idea/libraries/Maven__org_freemarker_freemarker_2_3_28.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.freemarker:freemarker:2.3.28">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/freemarker/freemarker/2.3.28/freemarker-2.3.28.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/freemarker/freemarker/2.3.28/freemarker-2.3.28-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/freemarker/freemarker/2.3.28/freemarker-2.3.28-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml
+++ b/.idea/libraries/Maven__org_javassist_javassist_3_20_0_GA.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.javassist:javassist:3.20.0-GA">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/javassist/javassist/3.20.0-GA/javassist-3.20.0-GA.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/javassist/javassist/3.20.0-GA/javassist-3.20.0-GA-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/javassist/javassist/3.20.0-GA/javassist-3.20.0-GA-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_jdom_jdom_1_1.xml
+++ b/.idea/libraries/Maven__org_jdom_jdom_1_1.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jdom:jdom:1.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/jdom/jdom/1.1/jdom-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/jdom/jdom/1.1/jdom-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/jdom/jdom/1.1/jdom-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml
+++ b/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.latencyutils:LatencyUtils:2.0.3">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/latencyutils/LatencyUtils/2.0.3/LatencyUtils-2.0.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/latencyutils/LatencyUtils/2.0.3/LatencyUtils-2.0.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/latencyutils/LatencyUtils/2.0.3/LatencyUtils-2.0.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml
+++ b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mapstruct:mapstruct:1.2.0.Final">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/mapstruct/mapstruct/1.2.0.Final/mapstruct-1.2.0.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/mapstruct/mapstruct/1.2.0.Final/mapstruct-1.2.0.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/mapstruct/mapstruct/1.2.0.Final/mapstruct-1.2.0.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml
+++ b/.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mybatis:mybatis:3.4.6">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/mybatis/mybatis/3.4.6/mybatis-3.4.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/mybatis/mybatis/3.4.6/mybatis-3.4.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/mybatis/mybatis/3.4.6/mybatis-3.4.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml
+++ b/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.mybatis:mybatis-spring:1.3.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/mybatis/mybatis-spring/1.3.2/mybatis-spring-1.3.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/mybatis/mybatis-spring/1.3.2/mybatis-spring-1.3.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/mybatis/mybatis-spring/1.3.2/mybatis-spring-1.3.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
+++ b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.opentest4j:opentest4j:1.2.0">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_ow2_asm_asm_4_2.xml
+++ b/.idea/libraries/Maven__org_ow2_asm_asm_4_2.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.ow2.asm:asm:4.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/ow2/asm/asm/4.2/asm-4.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/ow2/asm/asm/4.2/asm-4.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/ow2/asm/asm/4.2/asm-4.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml
+++ b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/springframework/plugin/spring-plugin-core/1.2.0.RELEASE/spring-plugin-core-1.2.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml
+++ b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/org/springframework/plugin/spring-plugin-metadata/1.2.0.RELEASE/spring-plugin-metadata-1.2.0.RELEASE-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml
+++ b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: stax:stax-api:1.0.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/stax/stax-api/1.0.1/stax-api-1.0.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/../../maven/maven-repository/stax/stax-api/1.0.1/stax-api-1.0.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
--- a/api/api.iml
+++ b/api/api.iml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+</module>
--- a/bank/bank.iml
+++ b/bank/bank.iml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+</module>
--- a/bank/src/main/java/com/huoran/bank/service/impl/BankServiceImpl.java
+++ b/bank/src/main/java/com/huoran/bank/service/impl/BankServiceImpl.java
@ -280,6 +280,7 @@ public class BankServiceImpl implements BankService {
        return R.error("无缓存");
    }

+
    /**
     * 删除缓存
     *
@ -295,3 +296,4 @@ public class BankServiceImpl implements BankService {
    }

 }
+
--- a/common/common.iml
+++ b/common/common.iml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+</module>
--- a/data_platform/data_platform.iml
+++ b/data_platform/data_platform.iml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+        </sourceRoots>
+      </configuration>
+    </facet>
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+</module>
--- a/gateway/gateway.iml
+++ b/gateway/gateway.iml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+</module>
--- a/huorantech.iml
+++ b/huorantech.iml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
--- a/judgment_point/judgment_point.iml
+++ b/judgment_point/judgment_point.iml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+        </sourceRoots>
+      </configuration>
+    </facet>
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+</module>
--- a/judgment_point/src/main/java/com/huoran/judgment_point/controller/BankLoanApplicationController.java
+++ b/judgment_point/src/main/java/com/huoran/judgment_point/controller/BankLoanApplicationController.java
@ -33,14 +33,15 @@ public class BankLoanApplicationController {
    @ApiOperation(value = "贷款申请录入")
    @PostMapping("/loanApplicationInput")
    public R loanApplicationInput(@RequestBody BankLoanApplication bankLoanApplication){
-        if (bankLoanApplication.getLoanId() == null ){
-            bankLoanApplication.setContractNumber(GenerateContractNumber.generateContractNumber());
-        }else {
+        if (bankLoanApplication.getLoanId() != null ){
            if (bankLoanApplication.getLoanAmount()!= null ){
                BigDecimal bigDecimal = calculateInterest(bankLoanApplication);
                bankLoanApplication.setTotalInterestAmount(bigDecimal.toString());
            }
        }
+        if (bankLoanApplication.getContractNumber() == null ){
+            bankLoanApplication.setContractNumber(GenerateContractNumber.generateContractNumber());
+        }
        boolean update = bankLoanApplicationService.saveOrUpdate(bankLoanApplication);
        return update ? R.ok().put("companyLoanId",bankLoanApplication.getCompanyLoanId())
                .put("loanId",bankLoanApplication.getLoanId()) : R.error();
--- a/judgment_point/src/main/java/com/huoran/judgment_point/entity/vo/CompanyLoanListVO.java
+++ b/judgment_point/src/main/java/com/huoran/judgment_point/entity/vo/CompanyLoanListVO.java
@ -50,7 +50,13 @@ public class CompanyLoanListVO {
    @ApiModelProperty(value = "贷款金额（放款金额与贷款金额一致）")
    private String loanAmount;

+    @ApiModelProperty(value = "利息总额")
+    private String totalInterestAmount;
+
    //累计还款金额
    @ApiModelProperty(value = "累计还款金额")
    private String totalRepaymentAmount;
+
+    @ApiModelProperty(value = "欠款金额")
+    private String arrearsAmount;
 }
--- a/judgment_point/src/main/java/com/huoran/judgment_point/mapper/xml/BankCompanyLoansMapper.xml
+++ b/judgment_point/src/main/java/com/huoran/judgment_point/mapper/xml/BankCompanyLoansMapper.xml
@ -18,6 +18,7 @@
        ce.customer_name,
        ca.loan_type,
        ca.loan_application_amount,
+        ca.total_interest_amount,
        ca.loan_amount,
        IFNULL(	(
        SELECT
--- a/judgment_point/src/main/java/com/huoran/judgment_point/service/impl/BankCompanyLoansServiceImpl.java
+++ b/judgment_point/src/main/java/com/huoran/judgment_point/service/impl/BankCompanyLoansServiceImpl.java
@ -9,8 +9,11 @@ import com.huoran.judgment_point.entity.req.CompanyLoanListReq;
 import com.huoran.judgment_point.entity.vo.CompanyLoanListVO;
 import com.huoran.judgment_point.mapper.BankCompanyLoansMapper;
 import com.huoran.judgment_point.service.BankCompanyLoansService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;

+import java.math.BigDecimal;
+
 /**
 * <p>
 * 公司贷款主键 服务实现类
@ -21,10 +24,42 @@ import org.springframework.stereotype.Service;
 */
@Service
 public class BankCompanyLoansServiceImpl extends ServiceImpl<BankCompanyLoansMapper, BankCompanyLoans> implements BankCompanyLoansService {
+
    @Override
    public R companyLoanList(CompanyLoanListReq companyLoanListReq) {
        Page<CompanyLoanListVO> page = new Page<>(companyLoanListReq.getPageNum(), companyLoanListReq.getPageSize());
        IPage<CompanyLoanListVO> iPage = baseMapper.companyLoanList(page, companyLoanListReq);
+        for (CompanyLoanListVO item : iPage.getRecords()) {
+            if (item.getLoanAmount()!= null){
+                BigDecimal amountDue = BigDecimal.ZERO;
+                BigDecimal interestTotal = BigDecimal.ZERO;
+                BigDecimal contractAmount = BigDecimal.ZERO;
+                BigDecimal totalRepaymentAmount = BigDecimal.ZERO;
+                BankCompanyLoans bankCompanyLoans = baseMapper.selectById(item.getCompanyLoanId());
+                //获取贷款合同金额
+                if (StringUtils.isNotBlank(item.getLoanAmount())){
+                    contractAmount = new BigDecimal(item.getLoanAmount());
+                }
+
+                //获取累计还款金额
+                if (StringUtils.isNotBlank(item.getTotalRepaymentAmount())){
+                    totalRepaymentAmount = new BigDecimal(item.getTotalRepaymentAmount());
+                }
+
+                //获取利息总和
+                if (StringUtils.isNotBlank(item.getTotalInterestAmount())){
+                    interestTotal = new BigDecimal(item.getTotalInterestAmount());
+                }
+
+                if (bankCompanyLoans.getLoanDate()!=null) {//是否有还款记录
+                    //有放款记录
+                    amountDue = contractAmount.subtract(totalRepaymentAmount).add(interestTotal);
+                } else {
+                    amountDue = contractAmount.add(interestTotal);
+                }
+                item.setArrearsAmount(String.valueOf(amountDue.setScale(2, BigDecimal.ROUND_DOWN)));
+            }
+        }
        return R.ok().put("page", iPage);
    }
 }
--- a/judgment_point/src/main/java/com/huoran/judgment_point/utils/RepaymentPlanCalculator.java
+++ b/judgment_point/src/main/java/com/huoran/judgment_point/utils/RepaymentPlanCalculator.java
@ -292,10 +292,20 @@ public class RepaymentPlanCalculator {
                Date startDateAsDate = Date.from(startDate.plusMonths(i).atStartOfDay(ZoneId.systemDefault()).toInstant());
                Date endDateAsDate = Date.from(periodEndDate.atStartOfDay(ZoneId.systemDefault()).toInstant());

+                // 创建并添加还款计划对象到列表
+                // 将Date转换为LocalDate进行格式化
+                LocalDate startDateLocal = startDateAsDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+                LocalDate endDateLocal = endDateAsDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+
+                // 使用DateTimeFormatter格式化LocalDate
+                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+                String startTime = startDateLocal.format(formatter);
+                String endTime = endDateLocal.format(formatter);
+
                // 创建并添加还款计划对象到列表
                BankCompanyRepaymentPlan plan = new BankCompanyRepaymentPlan().
-                        setPeriodStart(String.valueOf(startDateAsDate)).
-                        setPeriodEnd(String.valueOf(endDateAsDate)).
+                        setPeriodStart(startTime).
+                        setPeriodEnd(endTime).
                        setAmountDue(BigDecimal.valueOf(monthlyPayment)) // 确保金额为两位小数
                        .setStatus(String.valueOf(RepaymentStatus.PENDING_REPAYMENT)).
                        setCompanyLoanId(bankLoanApplication.getCompanyLoanId());
--- a/nakadai/nakadai.iml
+++ b/nakadai/nakadai.iml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+        </sourceRoots>
+      </configuration>
+    </facet>
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+</module>
--- a/occupationlab/occupationlab.iml
+++ b/occupationlab/occupationlab.iml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+        </sourceRoots>
+      </configuration>
+    </facet>
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+</module>
--- a/python/python.iml
+++ b/python/python.iml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+        </sourceRoots>
+      </configuration>
+    </facet>
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+</module>
--- a/users/users.iml
+++ b/users/users.iml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+        </sourceRoots>
+      </configuration>
+    </facet>
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+</module>