新增加司机端接口

puzhibing

2023-08-25 dccf96f22efad58f24fe496391c13339bd840d35

新增加司机端接口

 driver/.idea/libraries/Maven__com_huaweicloud_esdk_obs_java_bundle_3_22_12.xml

File was deleted

 driver/.idea/libraries/Maven__com_huaweicloud_esdk_obs_java_bundle_3_23_5.xml

File was renamed from driver/.idea/libraries/Maven__com_huaweicloud_esdk_obs_java_bundle_3_23_3.xml
@@ -1,13 +1,13 @@
<component name="libraryTable">
  <library name="Maven: com.huaweicloud:esdk-obs-java-bundle:3.23.3">
  <library name="Maven: com.huaweicloud:esdk-obs-java-bundle:3.23.5">
    <CLASSES>
      <root url="jar://$MAVEN_REPOSITORY$/com/huaweicloud/esdk-obs-java-bundle/3.23.3/esdk-obs-java-bundle-3.23.3.jar!/" />
      <root url="jar://$MAVEN_REPOSITORY$/com/huaweicloud/esdk-obs-java-bundle/3.23.5/esdk-obs-java-bundle-3.23.5.jar!/" />
    </CLASSES>
    <JAVADOC>
      <root url="jar://$MAVEN_REPOSITORY$/com/huaweicloud/esdk-obs-java-bundle/3.23.3/esdk-obs-java-bundle-3.23.3-javadoc.jar!/" />
      <root url="jar://$MAVEN_REPOSITORY$/com/huaweicloud/esdk-obs-java-bundle/3.23.5/esdk-obs-java-bundle-3.23.5-javadoc.jar!/" />
    </JAVADOC>
    <SOURCES>
      <root url="jar://$MAVEN_REPOSITORY$/com/huaweicloud/esdk-obs-java-bundle/3.23.3/esdk-obs-java-bundle-3.23.3-sources.jar!/" />
      <root url="jar://$MAVEN_REPOSITORY$/com/huaweicloud/esdk-obs-java-bundle/3.23.5/esdk-obs-java-bundle-3.23.5-sources.jar!/" />
    </SOURCES>
  </library>
</component>

 driver/guns-admin/guns-admin.iml

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
  <component name="FacetManager">
    <facet type="Spring" name="Spring">
      <configuration />
@@ -226,7 +226,7 @@
    <orderEntry type="library" name="Maven: com.alipay.sdk:alipay-sdk-java:4.8.10.ALL" level="project" />
    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.62" level="project" />
    <orderEntry type="library" name="Maven: com.huaweicloud:esdk-obs-java-bundle:3.22.12" level="project" />
    <orderEntry type="library" name="Maven: com.huaweicloud:esdk-obs-java-bundle:3.23.5" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.10.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.4.3" level="project" />

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java

@@ -604,7 +604,14 @@
        }
//        promotionWarpper.setUrl("https://chaoshengdaijia.com/share/driverShare/index.html?inviterId=" + uid);
        promotionWarpper.setUrl(driver1.getReferralCode());
        int user = appUserService.selectCount(new EntityWrapper<AppUser>().eq("inviterType", 2).eq("inviterId", uid).eq("status", 1));
        int user =0;
        List<AppUser> appUsers = appUserService.selectList(new EntityWrapper<AppUser>().eq("inviterType", 2).eq("inviterId", uid).eq("status", 1));
        for (AppUser appUser : appUsers) {
            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("userId", appUser.getId()).eq("state", 109));
            if(orders.size()>0){
                user++;
            }
        }
        int driver = this.selectCount(new EntityWrapper<Driver>().eq("inviterType", 2).eq("inviterId", uid).eq("approvalStatus", 2).eq("status", 1));
        promotionWarpper.setTotal(user + driver);
        promotionWarpper.setUser(user);
@@ -1123,7 +1130,14 @@
        map.put("okTime",okTime==null?0:okTime);
        wrapperOne.eq("inviterType",2);
        wrapperOne.eq("inviterId",uid);
        int userNum = appUserService.selectCount(wrapperOne);
        List<AppUser> appUsers = appUserService.selectList(wrapperOne);
        int userNum=0;
        for (AppUser appUser : appUsers) {
            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("userId", appUser.getId()).eq("state", 109));
            if(orders.size()>0){
                userNum++;
            }
        }


        map.put("userNum",userNum);

 eureka/.idea/workspace.xml

@@ -2,726 +2,17 @@
<project version="4">
  <component name="ChangeListManager">
    <list default="true" id="c2d0e290-924a-460e-aa64-6bd1777ddd95" name="Default Changelist" comment="修改配置">
      <change afterPath="$PROJECT_DIR$/../.idea/.gitignore" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/.name" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/SuperSaveDrivingDev.iml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/artifacts/guns_admin__1__war.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/artifacts/guns_admin__1__war_exploded.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/compiler.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/encodings.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/jarRepositories.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__antlr_antlr_2_7_7.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__c3p0_c3p0_0_9_1_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__cn_hutool_hutool_all_5_7_7.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__cn_jpush_api_jiguang_common_1_1_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__cn_jpush_api_jiguang_common_1_1_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__cn_jpush_api_jpush_client_3_2_17.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__cn_jpush_api_jpush_client_3_3_10.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__cn_rongcloud_im_server_sdk_java_3_0_4.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_alipay_sdk_alipay_sdk_java_4_8_10_ALL.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_4_4_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_2_5_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_baomidou_mybatis_plus_2_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_baomidou_mybatis_plus_core_2_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_baomidou_mybatis_plus_generate_2_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_baomidou_mybatis_plus_support_2_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_baomidou_mybatisplus_spring_boot_starter_1_0_5.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_5.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_5.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_xml_2_9_6.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_5.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_6.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_5.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_6.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_9_5.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_9_6.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_9_6.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_5.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_6.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_fasterxml_woodstox_woodstox_core_5_0_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_fasterxml_woodstox_woodstox_core_5_2_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_github_andrewoma_dexx_dexx_collections_0_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_github_vlsi_compactmap_compactmap_1_2_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_7.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_7.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_shangmi_0_2_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_google_code_gson_gson_2_8_5.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_google_guava_guava_16_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_google_guava_guava_20_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_google_inject_guice_4_1_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_google_zxing_core_3_2_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_huaweicloud_esdk_obs_java_3_19_5.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_huaweicloud_esdk_obs_java_bundle_3_23_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_ibeetl_beetl_2_8_5.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_jamesmurty_utils_java_xmlbuilder_1_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_9_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_9_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_12.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_12.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_12.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_12.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_3_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_netflix_netflix_commons_netflix_eventbus_0_3_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_netflix_netflix_commons_netflix_infix_0_3_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_2_5.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_2_5.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_2_5.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_2_5.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_2_5.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_2_5.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_netflix_zuul_zuul_core_1_3_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_spring4all_swagger_spring_boot_starter_1_7_0_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_8_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_squareup_okio_okio_1_13_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_squareup_okio_okio_1_14_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_sun_jersey_jersey_server_1_19_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_19_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_tencent_kona_kona_crypto_1_0_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_tencent_kona_kona_pkix_1_0_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_tencent_kona_kona_provider_1_0_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_10.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__commons_codec_commons_codec_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__commons_io_commons_io_2_4.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__commons_io_commons_io_2_6.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__commons_jxpath_commons_jxpath_1_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__de_rototor_pdfbox_graphics2d_0_30.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_9_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_lettuce_lettuce_core_5_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_micrometer_micrometer_core_1_0_6.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_netty_netty_all_4_1_23_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_netty_netty_all_4_1_27_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_netty_netty_buffer_4_1_23_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_netty_netty_buffer_4_1_27_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_netty_netty_codec_4_1_23_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_netty_netty_codec_4_1_27_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_netty_netty_codec_http_4_1_23_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_netty_netty_codec_http_4_1_27_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_netty_netty_common_4_1_23_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_netty_netty_common_4_1_27_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_netty_netty_handler_4_1_23_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_netty_netty_resolver_4_1_23_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_netty_netty_resolver_4_1_27_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_netty_netty_transport_4_1_23_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_netty_netty_transport_4_1_27_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_netty_netty_transport_native_epoll_4_1_23_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_netty_netty_transport_native_epoll_4_1_27_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_23_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_27_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_projectreactor_reactor_core_3_1_6_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_springfox_springfox_bean_validators_2_8_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_springfox_springfox_core_2_8_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_springfox_springfox_schema_2_8_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_springfox_springfox_spi_2_8_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_springfox_springfox_spring_web_2_8_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_springfox_springfox_swagger2_2_8_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_8_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_8_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_14.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_swagger_swagger_models_1_5_14.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__javax_inject_javax_inject_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__joda_time_joda_time_2_9_9.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__junit_junit_4_12.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__mysql_mysql_connector_java_8_0_11.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_abego_treelayout_org_abego_treelayout_core_1_0_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_antlr_antlr4_annotations_4_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_antlr_antlr4_runtime_4_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_ant_ant_1_8_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_ant_ant_launcher_1_8_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_commons_commons_compress_1_20.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_6.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_10.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_6.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_10_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_10_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_pdfbox_fontbox_2_0_22.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_pdfbox_pdfbox_2_0_22.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_poi_poi_3_9.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_poi_poi_5_0_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_poi_poi_examples_3_9.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_poi_poi_excelant_3_9.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_9.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_poi_poi_ooxml_5_0_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_poi_poi_ooxml_lite_5_0_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_9.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_poi_poi_scratchpad_3_9.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_santuario_xmlsec_2_2_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_7_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_8_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_7_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_8_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_7_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_8_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_core_1_7_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_core_1_8_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_7_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_8_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_7_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_8_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_7_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_8_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_7_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_8_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_event_1_7_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_event_1_8_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_7_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_8_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_7_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_8_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_web_1_7_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_shiro_shiro_web_1_8_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_32.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_32.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_32.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_4_0_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_all_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_anim_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_awt_util_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_bridge_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_codec_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_constants_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_css_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_dom_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_ext_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_extension_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_gui_util_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_gvt_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_i18n_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_parser_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_rasterizer_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_rasterizer_ext_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_script_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_shared_resources_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_slideshow_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_squiggle_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_squiggle_ext_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_svg_dom_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_svgbrowser_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_svggen_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_svgpp_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_svgrasterizer_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_swing_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_transcoder_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_ttf2svg_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_util_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_batik_xml_1_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_apache_xmlgraphics_xmlgraphics_commons_2_4.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_56.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_68.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_56.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_62.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_68.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_bouncycastle_bcprov_jdk18on_1_72.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_7.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_4_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_ehcache_ehcache_3_3_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_freemarker_freemarker_2_3_28.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_gavaghan_geodesy_1_1_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_10.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_11_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_ini4j_ini4j_0_5_4.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_jdom_jdom_1_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_mongodb_bson_3_6_4.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_mongodb_mongodb_driver_3_6_4.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_6_4.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_openjfx_javafx_base_11_0_0_SNAPSHOT.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_openjfx_javafx_base_linux_11_0_0_SNAPSHOT.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_openjfx_javafx_base_mac_11_0_0_SNAPSHOT.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_openjfx_javafx_base_win_11_0_0_SNAPSHOT.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_owasp_encoder_encoder_1_2_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_projectlombok_lombok_1_18_20.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_quartz_scheduler_quartz_2_2_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_reflections_reflections_0_9_11.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_cache_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_0_1_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_0_1_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_0_1_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_2_0_1_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_0_1_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_server_2_0_1_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_0_1_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_zuul_2_0_1_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_0_1_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_0_1_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_client_2_0_1_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_server_2_0_1_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_0_1_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_0_1_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_zuul_2_0_1_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_6_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_0_6_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_data_spring_data_mongodb_2_0_6_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_0_6_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_security_spring_security_config_5_0_7_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_security_spring_security_core_5_0_7_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_0_7_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_5_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_security_spring_security_web_5_0_7_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_aop_5_0_5_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_aop_5_0_8_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_beans_5_0_5_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_beans_5_0_8_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_context_5_0_5_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_context_5_0_8_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_context_support_5_0_5_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_context_support_5_0_8_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_core_5_0_8_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_expression_5_0_5_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_expression_5_0_8_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_jcl_5_0_5_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_jcl_5_0_8_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_5_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_oxm_5_0_5_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_test_5_0_5_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_test_5_0_8_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_tx_5_0_5_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_web_5_0_5_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_web_5_0_8_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_5_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_8_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__stax_stax_api_1_0_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__xalan_serializer_2_7_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__xalan_xalan_2_7_2.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__xml_apis_xml_apis_ext_1_3_04.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/misc.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/modules.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../.idea/vcs.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/.idea/driver.iml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/CompanyFundFlowMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/DivisionRecordMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/DriverOnlineTimeMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/CompanyFundFlowMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/DivisionRecordMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/DriverOnlineTimeMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/CompanyFundFlow.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/DivisionRecord.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/DriverOnlineTime.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/ICompanyFundFlowService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDivisionRecordService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverOnlineTimeService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/CompanyFundFlowServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DivisionRecordServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverOnlineTimeServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/Complete.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/PamentOrderUser.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/PaymentOrder.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/PaymentOrderGood.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/QueryOrder.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/QueryUser.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/Receive.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/ReceiveGood.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/ReceiveUser.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/Transfer.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/Withdraw.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/AES.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/AesException.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/ByteGroup.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/PKCS7Encoder.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/SHA1.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/WXBizMsgCrypt.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/WXCore.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/WeChatUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/WxPKCS7Encoder.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/XMLParse.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/Category.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/Code2Session.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/KeywordEnum.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/MessageTemplate.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/PubTemplateKeywords.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/PubTemplatetitles.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-core/guns-core (1) (com.supersavedriving).iml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-generator/guns-generator (1) (com.supersavedriving).iml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../driver/guns-parent (1) (com.supersavedriving).iml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/demo.iml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/.idea/artifacts/guns_admin_war.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/.idea/artifacts/guns_admin_war_exploded.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/.idea/libraries/Maven__cn_hutool_hutool_all_5_7_7.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_shangmi_0_2_1.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/.idea/libraries/Maven__com_tencent_kona_kona_crypto_1_0_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/.idea/libraries/Maven__com_tencent_kona_kona_pkix_1_0_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/.idea/libraries/Maven__com_tencent_kona_kona_provider_1_0_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk18on_1_72.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/.idea/libraries/Maven__org_projectlombok_lombok_1_18_20.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/.idea/management.iml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/AccountChangeDetailMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CompanyFundFlowMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DivisionRecordMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverOnlineTimeMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RechargeRecordMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SettlementRecordMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/AccountChangeDetailMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CompanyFundFlowMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DivisionRecordMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverOnlineTimeMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RechargeRecordMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SettlementRecordMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/AccountChangeDetail.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CompanyFundFlow.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DivisionRecord.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverOnlineTime.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/RechargeRecord.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SettlementRecord.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICompanyFundFlowService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDivisionRecordService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverOnlineTimeService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRechargeRecordService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISettlementRecordService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CompanyFundFlowServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DivisionRecordServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOnlineTimeServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RechargeRecordServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SettlementRecordServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MallBook/config/ChannelConfig.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MallBook/model/BindAccount.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MallBook/model/Deposit.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MallBook/model/ImageUpload.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MallBook/model/InterfaceRequest.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MallBook/model/InterfaceResponse.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MallBook/model/QueryBalance.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MallBook/model/QueryOrder.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MallBook/model/Register.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MallBook/model/UnbindAccount.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MallBook/model/Withdraw.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MallBook/util/Base64.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MallBook/util/CacheUtils.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MallBook/util/RSAEncryptGeneration.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MallBook/util/RSASignature.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MallBook/util/StringUtil.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/MallBook/util/TrhRequest.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/PushOrderInfoWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/enterprisePage.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/audio/cancelOrder.mp3" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/audio/lobbyOrder.mp3" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/audio/newOrder.mp3" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/js/jquery.qrcode.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/js/qrcode.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgentInfo.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-core/guns-core (1).iml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-generator/guns-generator (1).iml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../management/guns-parent (1).iml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../user/.idea/.name" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../user/.idea/libraries/Maven__com_huaweicloud_esdk_obs_java_bundle_3_23_3.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/BranchOfficeMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/CompanyFundFlowMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/BranchOfficeMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/CompanyFundFlowMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/BranchOffice.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/CompanyFundFlow.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IBranchOfficeService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/ICompanyFundFlowService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/BranchOfficeServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/CompanyFundFlowServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/model/QueryBalance.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/model/QueryOrder.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/DriverRegisterWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../user/guns-parent.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/core/common/constant/JwtConstants.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/core/common/constant/JwtConstants.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/SystemConfigController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/SystemConfigController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/auth/AuthIntercepter.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/auth/AuthIntercepter.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/DriverMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/DriverMapper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/RevenueMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/RevenueMapper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/YouTuiDriverMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/YouTuiDriverMapper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/AccountChangeDetailMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/AccountChangeDetailMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/CashWithdrawalMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/CashWithdrawalMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/DriverMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/DriverMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/RechargeRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/RechargeRecordMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/RevenueMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/RevenueMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/YouTuiDriverMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/YouTuiDriverMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Agent.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Agent.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/CashWithdrawal.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/CashWithdrawal.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Coupon.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Coupon.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Driver.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Driver.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/RechargeRecord.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/RechargeRecord.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/ICashWithdrawalService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/ICashWithdrawalService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverWorkService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverWorkService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderPositionService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderPositionService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IRevenueService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IRevenueService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IYouTuiDriverService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IYouTuiDriverService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AccountChangeDetailServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AccountChangeDetailServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/CashWithdrawalServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/CashWithdrawalServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverBankServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverBankServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/.idea/libraries/Maven__com_huaweicloud_esdk_obs_java_bundle_3_22_12.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/.idea/libraries/Maven__com_huaweicloud_esdk_obs_java_bundle_3_23_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/.idea/libraries/Maven__com_huaweicloud_esdk_obs_java_bundle_3_23_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/.idea/libraries/Maven__com_huaweicloud_esdk_obs_java_bundle_3_23_5.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/guns-admin (1) (com.supersavedriving).iml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/guns-admin (1) (com.supersavedriving).iml" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/guns-admin (1).iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/guns-admin.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/guns-admin.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverWorkServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverWorkServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/YouTuiDriverServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/YouTuiDriverServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/config/ChannelConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/config/ChannelConfig.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/util/TrhRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/util/TrhRequest.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PayMoneyUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PayMoneyUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/RedisUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/RedisUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/WeChatUtil.java" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/BalanceDetailWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/BalanceDetailWarpper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/CommissionListWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/CommissionListWarpper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverRegisterWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverRegisterWarpper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderPriceWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderPriceWarpper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/PushOrderInfoWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/PushOrderInfoWarpper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/resources/logback-spring.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/resources/logback-spring.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../driver/guns-admin/src/main/resources/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/src/main/resources/redis.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/.idea/libraries/Maven__cn_hutool_hutool_core_5_3_8.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/.idea/libraries/Maven__cn_hutool_hutool_crypto_5_3_8.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/guns-admin (1).iml" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/guns-admin/guns-admin (1) (com.supersavedriving).iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/guns-admin.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/guns-admin.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/pom.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/config/web/ShiroConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/config/web/ShiroConfig.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ApiController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSystemConfigController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TDriverResp.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/resp/TDriverResp.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/DictController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/DictController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LogController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LogController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginLogController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginLogController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/MenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/MenuController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCancelOrderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCancelOrderMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAgent.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAgent.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAppUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAppUser.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCoupon.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCoupon.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemConfig.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAgentService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAgentService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TBranchOfficeServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRevenueServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRevenueServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/resources/logback-spring.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/resources/logback-spring.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/resources/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/resources/redis.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/login.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/netCarInfo.html" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgent.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgent.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgentArea.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgentArea.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgentDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgentDetail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgent_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgent_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgent_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgent_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOfficeDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOfficeDetail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tBranchOffice/tBranchOffice_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tCoupon/tCoupon_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriverDetail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tHomePage/tHomePageStatistics.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tHomePage/tHomePageStatistics.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrderDetail.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigBalanceRules.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigBalanceRules.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigCommissionShareRules.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigCommissionShareRules.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigDispatchRules.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigDispatchRules.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigExtractionRules.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigExtractionRules.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigPriceRules.html" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigPriceRules.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent.js" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice.js" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/modular/system/tBranchOffice/tBranchOffice_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/modular/system/tCoupon/tCoupon_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/modular/system/tCoupon/tCoupon_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/modular/system/tOrder/tOrder.js" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/modular/system/tOrder/tOrder.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/modular/system/user/user_info.js" beforeDir="false" afterPath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/modular/system/user/user_info.js" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../management/guns-admin/src/main/webapp/static/netCarInfo.js" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../super_save_driving.sql" beforeDir="false" afterPath="$PROJECT_DIR$/../super_save_driving.sql" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/.idea/libraries/Maven__com_huaweicloud_esdk_obs_java_bundle_3_22_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../driver/.idea/libraries/Maven__com_huaweicloud_esdk_obs_java_bundle_3_23_3.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/guns-admin.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/guns-admin.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/core/common/constant/JwtConstants.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/core/common/constant/JwtConstants.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/AppUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/AppUserController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/HtmlController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/HtmlController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/auth/AuthIntercepter.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/auth/AuthIntercepter.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/RevenueMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/RevenueMapper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/OrderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/OrderMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/RechargeRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/RechargeRecordMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/RevenueMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/RevenueMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Agent.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Agent.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/AppUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/AppUser.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Coupon.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Coupon.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/DivisionRecord.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/DivisionRecord.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Driver.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Driver.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/RechargeRecord.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/RechargeRecord.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IDriverService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IDriverService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IOrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IOrderService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IRevenueService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IRevenueService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/RevenueServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/RevenueServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/SystemConfigServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/SystemConfigServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/GaoDe/MapUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/GaoDe/MapUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/config/ChannelConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/config/ChannelConfig.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/util/TrhRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/util/TrhRequest.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/PushUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/PushUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/weChat/WeChatUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/weChat/WeChatUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderInfoWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderInfoWarpper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/PushOrderInfoWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/PushOrderInfoWarpper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/resources/logback-spring.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/resources/logback-spring.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/resources/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/resources/redis.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../zuul/src/main/java/com/sinata/zuul/util/applets/NettyWebSocketController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../zuul/src/main/java/com/sinata/zuul/util/applets/NettyWebSocketController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../zuul/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../zuul/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../zuul/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/../zuul/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../zuul/src/main/resources/redis.properties" beforeDir="false" afterPath="$PROJECT_DIR$/../zuul/src/main/resources/redis.properties" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java" afterDir="false" />
    </list>
    <ignored path="$PROJECT_DIR$/target/" />
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -736,11 +27,13 @@
        <counts>
          <entry key="project.closed" value="11" />
          <entry key="project.open.time.0" value="6" />
          <entry key="project.open.time.1" value="3" />
          <entry key="project.open.time.1" value="4" />
          <entry key="project.open.time.3" value="1" />
          <entry key="project.open.time.5" value="1" />
          <entry key="project.open.time.6" value="5" />
          <entry key="project.open.time.7" value="1" />
          <entry key="project.opened" value="16" />
          <entry key="project.open.time.8" value="1" />
          <entry key="project.opened" value="19" />
        </counts>
      </usages-collector>
      <usages-collector id="statistics.file.extensions.open">
@@ -796,8 +89,8 @@
      <file pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="425">
              <caret line="17" column="25" lean-forward="true" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
            <state relative-caret-position="350">
              <caret line="14" column="11" selection-start-line="14" selection-start-column="11" selection-end-line="14" selection-end-column="11" />
            </state>
          </provider>
        </entry>
@@ -859,10 +152,10 @@
    </treeState>
  </component>
  <component name="ProjectFrameBounds" extendedState="6">
    <option name="x" value="-44" />
    <option name="y" value="296" />
    <option name="width" value="1932" />
    <option name="height" value="1046" />
    <option name="x" value="178" />
    <option name="y" value="17" />
    <option name="width" value="1454" />
    <option name="height" value="970" />
  </component>
  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
    <ConfirmationsSetting value="2" id="Add" />
@@ -872,7 +165,6 @@
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
      <pane id="AndroidView" />
      <pane id="ProjectPane">
        <subPane>
          <expand>
@@ -928,6 +220,7 @@
      </pane>
      <pane id="PackagesPane" />
      <pane id="Scope" />
      <pane id="AndroidView" />
    </panes>
  </component>
  <component name="PropertiesComponent">
@@ -937,7 +230,7 @@
    <property name="RequestMappingsPanelWidth1" value="75" />
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1692184670319" />
    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1692352235673" />
    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../JingLanChuXing/DriverJNTravel" />
    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -992,7 +285,10 @@
      <workItem from="1685585143930" duration="747000" />
      <workItem from="1686297460665" duration="79000" />
      <workItem from="1692176728619" duration="263000" />
      <workItem from="1692177022150" duration="789000" />
      <workItem from="1692177022150" duration="1385000" />
      <workItem from="1692585994714" duration="608000" />
      <workItem from="1692710366694" duration="619000" />
      <workItem from="1692839411396" duration="639000" />
    </task>
    <task id="LOCAL-00001" summary="提交注册中心代码">
      <created>1678668147753</created>
@@ -1019,12 +315,12 @@
    <servers />
  </component>
  <component name="TimeTrackingManager">
    <option name="totallyTimeSpent" value="23400000" />
    <option name="totallyTimeSpent" value="25862000" />
  </component>
  <component name="ToolWindowManager">
    <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
    <layout>
      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17803837" />
      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.13646056" />
      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
      <window_info id="Designer" order="2" />
      <window_info id="Image Layers" order="3" />
@@ -1035,7 +331,7 @@
      <window_info anchor="bottom" id="Message" order="0" />
      <window_info anchor="bottom" id="Find" order="1" />
      <window_info anchor="bottom" id="Run" order="2" weight="0.32899022" />
      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.26275787" />
      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.2801303" />
      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
      <window_info anchor="bottom" id="TODO" order="6" />
@@ -1099,8 +395,8 @@
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="425">
          <caret line="17" column="25" lean-forward="true" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
        <state relative-caret-position="350">
          <caret line="14" column="11" selection-start-line="14" selection-start-column="11" selection-end-line="14" selection-end-column="11" />
        </state>
      </provider>
    </entry>

 management/guns-admin/guns-admin (1).iml

File was renamed from driver/guns-admin/guns-admin (1) (com.supersavedriving).iml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
  <component name="FacetManager">
    <facet type="Spring" name="Spring">
      <configuration />
@@ -101,7 +101,7 @@
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
    <orderEntry type="library" name="Maven: io.reactivex:rxjava-reactive-streams:1.2.1" level="project" />
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
    <orderEntry type="module" module-name="guns-core (1) (com.supersavedriving)" />
    <orderEntry type="module" module-name="guns-core" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatisplus-spring-boot-starter:1.0.5" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:2.3" level="project" />
@@ -121,7 +121,7 @@
    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.10" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
    <orderEntry type="module" module-name="guns-generator (1) (com.supersavedriving)" />
    <orderEntry type="module" module-name="guns-generator" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generate:2.3" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.0.4.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.0.4.RELEASE" level="project" />
@@ -146,10 +146,6 @@
    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.11.Final" level="project" />
    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:11.0.0-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:linux:11.0.0-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:mac:11.0.0-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: org.openjfx:javafx.base:win:11.0.0-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.5.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.0.5.RELEASE" level="project" />

 user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java

@@ -68,6 +68,15 @@
    @Autowired
    private ISystemConfigService systemConfigService;

    @Autowired
    private IRechargeRecordService rechargeRecordService;

    @Autowired
    private IAccountChangeDetailService accountChangeDetailService;

    @Autowired
    private IDivisionRecordService divisionRecordService;




@@ -91,14 +100,11 @@
                BranchOffice branchOffice = districtCode1.get(0);
                Integer id = branchOffice.getId();
                SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 8).eq("companyId", id));
                SystemConfig systemConfig9 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 9).eq("companyId", id));
                if(systemConfig!=null && systemConfig9!=null){
                if(systemConfig!=null){
                    String content = systemConfig.getContent();
                    JSONObject jsonObject = JSONObject.parseObject(content);
                    String num1 = jsonObject.get("num1").toString();
                    String content9 = systemConfig9.getContent();
                    JSONObject jsonObject9 = JSONObject.parseObject(content9);
                    String num9 = jsonObject9.get("num1").toString();
                    String num9 = jsonObject.get("num3").toString();
                    if("1".equals(num1)){
                        i=1;
                    }
@@ -109,6 +115,9 @@
                        i=3;
                    }
                }
                if(i == 0){
                    i = 4;
                }
            }
            return ResponseWarpper.success(i);
        }catch (Exception e){
@@ -116,14 +125,6 @@
            return new ResponseWarpper(500, e.getMessage());
        }
    }
    @Autowired
    private IRechargeRecordService rechargeRecordService;

    @Autowired
    private IAccountChangeDetailService accountChangeDetailService;

    @Autowired
    private IDivisionRecordService divisionRecordService;




 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java

@@ -119,6 +119,9 @@
    @Resource
    private ICompanyFundFlowService companyFundFlowService;

    @Autowired
    private IBranchOfficeService branchOfficeService;

    @Value("${wx.appletsAppid}")
    private String appletsAppid;

@@ -151,15 +154,28 @@
            estimatedCostsWarpper.setTravelTime(Integer.valueOf(distance.get("duration")) / 60);
        }
        String city = "";
        Integer branchOfficeId = null;
        District geocode = MapUtil.geocode(estimatedCosts.getStartLng().toString(), estimatedCosts.getStartLat().toString());
        if(null != geocode){
            WeatherCity weatherCity = weatherCityService.selectOne(new EntityWrapper<WeatherCity>()
                    .where("'" + geocode.getCity() + "' like CONCAT('%', city, '%') and '" + geocode.getDistrict() + "' like CONCAT('%', district, '%') "));
            city = null != weatherCity ? weatherCity.getId().toString() : "";
            String districtCode = geocode.getDistrictCode();
            BranchOffice branchOffice = branchOfficeService.selectOne(new EntityWrapper<BranchOffice>().eq("status", 1).eq("districtCode", districtCode));
            if(null == branchOffice){
                String cityCode = geocode.getCityCode();
                branchOffice = branchOfficeService.selectOne(new EntityWrapper<BranchOffice>().eq("status", 1).eq("cityCode", cityCode));
                if(null == branchOffice){
                    String provinceCode = geocode.getProvinceCode();
                    branchOffice = branchOfficeService.selectOne(new EntityWrapper<BranchOffice>().eq("status", 1).eq("provinceCode", provinceCode));
                }
            }
            if(null == branchOffice){
                return ResultUtil.error("起点暂无企业服务");
            }
            branchOfficeId = branchOffice.getId();
        }

        Order order1 = new Order();
        order1.setCreateTime(new Date());
        Order order = getOrderPrice(1, d, 0, order1, city);
        Order order = getOrderPrice(1, d, 0, order1, city, branchOfficeId);
        Double estimatedPrice = order.getEstimatedPrice();
        Coupon coupon = userToCouponService.queryCoupon(uid, estimatedPrice);
        if(null != coupon){
@@ -212,11 +228,9 @@
     * @param city          查询天气的城市
     * @return
     */
    public Order getOrderPrice(Integer type, Double distance, Integer waitTime, Order order, String city){
    public Order getOrderPrice(Integer type, Double distance, Integer waitTime, Order order, String city, Integer branchOfficeId){
        order = getOrderInitialPrice(order);
        Integer driverId = order.getDriverId();
        Driver driver = driverService.selectById(driverId);
        SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 5).eq("companyId",driver.getBranchOfficeId()));
        SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 5).eq("companyId", branchOfficeId));
        if(null == systemConfig){
            if(type == 1){//预估金额
                order.setEstimatedPrice(0D);
@@ -318,8 +332,6 @@
        Double num8 = extraCost.getDouble("num8");//恶劣天气超出公里单价 X/公里
        Double num9 = extraCost.getDouble("num9");//恶劣天气最高收取金额
        Double num10 = extraCost.getDouble("num10");//节假日收费
//        Double num11 = extraCost.getDouble("num11");//恶劣天气最高收取金额
//        Double num12 = extraCost.getDouble("num12");//恶劣天气最高收取金额

        //等待费用
        if(waitTime.compareTo(num1 * 60) >= 0){
@@ -333,46 +345,34 @@
        }

        //恶劣天气
        systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 8).eq("companyId",driver.getBranchOfficeId()));
        systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 8).eq("companyId", branchOfficeId));
        if(null != systemConfig){
            JSONObject jsonObject1 = JSON.parseObject(systemConfig.getContent());
            Integer num11 = jsonObject1.getInteger("num1");//开启恶劣天气计价
            Integer num31 = jsonObject1.getInteger("num3");
            if(1 == num11){
//                boolean badWeather = WeatherUtil.isBadWeather(city);
//                if(badWeather){
                    order.setBadWeatherDistance(num5);//恶劣天气公里
                    order.setBadWeatherPrice(num6);//恶劣天气费
                    if(distance.compareTo(num7) > 0){
                        BigDecimal subtract = new BigDecimal(distance).subtract(new BigDecimal(num7));
                        BigDecimal multiply = subtract.multiply(new BigDecimal(num8));
                        order.setOverBadWeatherDistance(subtract.doubleValue());//恶劣天气超出公里
                        order.setOverBadWeatherPrice(multiply.doubleValue());//恶劣天气超出公里费
                    }
                order.setBadWeatherDistance(num5);//恶劣天气公里
                order.setBadWeatherPrice(num6);//恶劣天气费
                if(distance.compareTo(num7) > 0){
                    BigDecimal subtract = new BigDecimal(distance).subtract(new BigDecimal(num7));
                    BigDecimal multiply = subtract.multiply(new BigDecimal(num8));
                    order.setOverBadWeatherDistance(subtract.doubleValue());//恶劣天气超出公里
                    order.setOverBadWeatherPrice(multiply.doubleValue());//恶劣天气超出公里费
                }

                    double add = new BigDecimal(order.getOverBadWeatherPrice()).add(new BigDecimal(order.getBadWeatherPrice())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
                    if(num9.compareTo(add) < 0){//超出最高金额（重新调整金额）
                        if(num9.compareTo(num6) < 0){//如果恶劣天气费大于最高金额
                            order.setBadWeatherPrice(num9);//恶劣天气费
                            order.setOverBadWeatherPrice(0D);//恶劣天气超出公里费
                        }else{
                            BigDecimal subtract = new BigDecimal(num9).subtract(new BigDecimal(add));
                            order.setOverBadWeatherPrice(subtract.doubleValue());//恶劣天气超出公里费
                        }
                double add = new BigDecimal(order.getOverBadWeatherPrice()).add(new BigDecimal(order.getBadWeatherPrice())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
                if(num9.compareTo(add) < 0){//超出最高金额（重新调整金额）
                    if(num9.compareTo(num6) < 0){//如果恶劣天气费大于最高金额
                        order.setBadWeatherPrice(num9);//恶劣天气费
                        order.setOverBadWeatherPrice(0D);//恶劣天气超出公里费
                    }else{
                        BigDecimal subtract = new BigDecimal(num9).subtract(new BigDecimal(add));
                        order.setOverBadWeatherPrice(subtract.doubleValue());//恶劣天气超出公里费
                    }
//                }
                }
            }
        }



        //节假日
        systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 9).eq("companyId",driver.getBranchOfficeId()));
        if(null != systemConfig){
            JSONObject jsonObject1 = JSON.parseObject(systemConfig.getContent());
            Integer num11 = jsonObject1.getInteger("num1");//开启恶劣天气计价
            if(1 == num11){
                BigDecimal bigDecimal = new BigDecimal(num10);
                order.setHolidayPrice(bigDecimal.doubleValue());
            if(1 == num31){//节假日
                order.setHolidayPrice(num10);
            }
        }

@@ -414,6 +414,7 @@
        order.setBadWeatherPrice(0D);//恶劣天气里程费
        order.setOverBadWeatherDistance(0D);//恶劣天气超出里程
        order.setOverBadWeatherPrice(0D);//恶劣天气超出里程费
        order.setHolidayPrice(0D);//节假日
        order.setDiscountedPrice(0D);//优惠金额
        order.setCouponId(null);//优惠券
        order.setDiscountAmount(0D);//折扣优惠金额
@@ -477,14 +478,27 @@
            order.setEstimatedTime(Integer.valueOf(distance.get("duration")) / 60);
        }
        String city = "";
        District geocode = MapUtil.geocode(order.getStartLng(), order.getStartLat());
        Integer branchOfficeId = null;
        District geocode = MapUtil.geocode(order.getStartLng().toString(), order.getStartLat().toString());
        if(null != geocode){
            WeatherCity weatherCity = weatherCityService.selectOne(new EntityWrapper<WeatherCity>()
                    .where("'" + geocode.getCity() + "' like CONCAT('%', city, '%') and '" + geocode.getDistrict() + "' like CONCAT('%', district, '%') "));
            city = null != weatherCity ? weatherCity.getId().toString() : "";
            String districtCode = geocode.getDistrictCode();
            BranchOffice branchOffice = branchOfficeService.selectOne(new EntityWrapper<BranchOffice>().eq("status", 1).eq("districtCode", districtCode));
            if(null == branchOffice){
                String cityCode = geocode.getCityCode();
                branchOffice = branchOfficeService.selectOne(new EntityWrapper<BranchOffice>().eq("status", 1).eq("cityCode", cityCode));
                if(null == branchOffice){
                    String provinceCode = geocode.getProvinceCode();
                    branchOffice = branchOfficeService.selectOne(new EntityWrapper<BranchOffice>().eq("status", 1).eq("provinceCode", provinceCode));
                }
            }
            if(null == branchOffice){
                return ResultUtil.error("起点暂无企业服务");
            }
            branchOfficeId = branchOffice.getId();
        }

        order.setCreateTime(new Date());
        order = getOrderPrice(1, d, 0, order, city);
        order = getOrderPrice(1, d, 0, order, city, branchOfficeId);
        if(null != travelOrder.getDriverId()){
            DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", travelOrder.getDriverId()).eq("status", 1));
            if(null == driverWork){
@@ -881,15 +895,27 @@
            order.setEstimatedTime(Integer.valueOf(distance.get("duration")) / 60);
        }
        String city = "";
        Integer branchOfficeId = null;
        District geocode = MapUtil.geocode(order.getStartLng().toString(), order.getStartLat().toString());
        if(null != geocode){
            WeatherCity weatherCity = weatherCityService.selectOne(new EntityWrapper<WeatherCity>()
                    .where("'" + geocode.getCity() + "' like CONCAT('%', city, '%') and '" + geocode.getDistrict() + "' like CONCAT('%', district, '%') "));
            city = null != weatherCity ? weatherCity.getId().toString() : "";
            String districtCode = geocode.getDistrictCode();
            BranchOffice branchOffice = branchOfficeService.selectOne(new EntityWrapper<BranchOffice>().eq("status", 1).eq("districtCode", districtCode));
            if(null == branchOffice){
                String cityCode = geocode.getCityCode();
                branchOffice = branchOfficeService.selectOne(new EntityWrapper<BranchOffice>().eq("status", 1).eq("cityCode", cityCode));
                if(null == branchOffice){
                    String provinceCode = geocode.getProvinceCode();
                    branchOffice = branchOfficeService.selectOne(new EntityWrapper<BranchOffice>().eq("status", 1).eq("provinceCode", provinceCode));
                }
            }
            if(null == branchOffice){
                return ResultUtil.error("起点暂无企业服务");
            }
            branchOfficeId = branchOffice.getId();
        }
        Order order1 = new Order();
        BeanUtils.copyProperties(order, order1);
        Order orderPrice = getOrderPrice(1, d, 0, order1, city);
        Order orderPrice = getOrderPrice(1, d, 0, order1, city, branchOfficeId);
        order.setEstimatedPrice(orderPrice.getEstimatedPrice());
        this.updateById(order);

@@ -942,6 +968,7 @@
        if(order.getState() < 107){
            orderPriceWarpper.setPayMoney(order.getOrderMoney());
        }
        orderPriceWarpper.setHolidayPrice(order.getHolidayPrice());
        return orderPriceWarpper;
    }


 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java

@@ -35,6 +35,8 @@
    private Double discountedPrice;
    @ApiModelProperty("恶劣天气费")
    private Double badWeatherPrice;
    @ApiModelProperty("节假日费")
    private Double holidayPrice;
    @ApiModelProperty("订单金额")
    private Double orderMoney;
    @ApiModelProperty("支付金额")