更新代码

Pu Zhibing

昨天 e25f9982ebb85e4d5fb5551e849b08b348b865ac

 DriverZYTravel/.idea/workspace.xml

@@ -4,442 +4,23 @@
    <option name="autoReloadType" value="SELECTIVE" />
  </component>
  <component name="ChangeListManager">
    <list default="true" id="e59113f5-77fa-4a43-a64c-9ebb3a89416d" name="Default Changelist" comment="">
      <change afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.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_netty_netty_handler_4_1_23_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__org_springframework_boot_spring_boot_starter_data_redis_2_0_4_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_redis_2_0_6_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/shelf/_2024_6_28_9_38___Default_Changelist_.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/.idea/shelf/_2024_8_13_17_50___Default_Changelist_.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/.idea/smartfox_info.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../EurekaZYTravel/.idea/jarRepositories.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../UserZYTravel/.idea/jarRepositories.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../UserZYTravel/guns-admin/guns-logs/log_error.log" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../UserZYTravel/guns-admin/guns-logs/log_total.log" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../ZuulZYTravel/.idea/jarRepositories.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__io_lettuce_lettuce_core_5_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__io_netty_netty_handler_4_1_27_Final.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__io_projectreactor_reactor_core_3_1_8_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_0_4_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_9_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_0_9_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_0_9_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_8_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__org_springframework_spring_oxm_5_0_8_RELEASE.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__org_springframework_spring_tx_5_0_8_RELEASE.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementZYTravel/.idea/compiler.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementZYTravel/.idea/encodings.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__c3p0_c3p0_0_9_1_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__cn_jpush_api_jiguang_common_1_1_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__cn_jpush_api_jpush_client_3_2_17.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__cn_rongcloud_im_server_sdk_java_3_0_4.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_2_5_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_baomidou_mybatis_plus_2_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_2_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_baomidou_mybatis_plus_generate_2_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_baomidou_mybatis_plus_support_2_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_baomidou_mybatisplus_spring_boot_starter_1_0_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_07.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_google_code_gson_gson_2_8_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_google_guava_guava_20_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_google_zxing_core_3_2_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_huaweicloud_esdk_obs_java_3_19_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_ibeetl_beetl_2_8_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_jamesmurty_utils_java_xmlbuilder_1_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_qiniu_qiniu_java_sdk_7_10_4.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_14_4.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_8_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_squareup_okio_okio_1_14_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_squareup_okio_okio_1_17_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_10.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__commons_io_commons_io_2_6.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_9_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__io_netty_netty_all_4_1_23_Final.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__junit_junit_4_12.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_11.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__net_sf_ezmorph_ezmorph_1_0_6.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__net_sf_json_lib_json_lib_jdk15_2_4.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_abego_treelayout_org_abego_treelayout_core_1_0_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_antlr_antlr4_annotations_4_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_antlr_antlr4_runtime_4_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_ant_ant_1_8_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_8_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_commons_commons_compress_1_21.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_6.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_10.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_10_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_10_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_poi_poi_3_9.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_poi_poi_5_2_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_poi_poi_examples_3_9.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_poi_poi_excelant_3_9.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_9.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_poi_poi_ooxml_5_2_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_poi_poi_ooxml_lite_5_2_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_9.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_poi_poi_scratchpad_3_9.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_32.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_32.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_32.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_3_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_5_1_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_ehcache_ehcache_3_3_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_11_Final.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_jdom_jdom_1_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_owasp_encoder_encoder_1_2_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_projectlombok_lombok_1_16_22.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_2_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_cache_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_quartz_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_spring_aop_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_spring_beans_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_spring_context_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_spring_core_5_0_8_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_spring_expression_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_spring_test_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_spring_tx_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_spring_web_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementZYTravel/.idea/misc.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementZYTravel/.idea/modules.xml" afterDir="false" />
    <list default="true" id="e59113f5-77fa-4a43-a64c-9ebb3a89416d" name="Default Changelist" comment="修改bug">
      <change afterPath="$PROJECT_DIR$/../ZuulZYTravel/.idea/modules.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementZYTravel/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/ManagementZYTravel.iml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/guns-admin/guns-admin.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementZYTravel/guns-admin/guns-admin.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/guns-core/guns-core.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementZYTravel/guns-core/guns-core.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ManagementZYTravel/guns-generator/guns-generator.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../ManagementZYTravel/guns-generator/guns-generator.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserZYTravel/.idea/compiler.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserZYTravel/.idea/encodings.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_alipay_sdk_alipay_sdk_java_4_8_10_ALL.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_core_4_4_6.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_ecs_4_17_6.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_ram_3_0_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_aliyun_aliyun_java_sdk_sts_3_0_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_3_8_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_baomidou_mybatis_plus_2_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_2_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_baomidou_mybatis_plus_generate_2_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_baomidou_mybatis_plus_support_2_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_baomidou_mybatisplus_spring_boot_starter_1_0_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_9_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_github_andrewoma_dexx_dexx_collections_0_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_github_penggle_kaptcha_2_3_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_github_vlsi_compactmap_compactmap_1_2_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_google_code_gson_gson_2_8_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_google_guava_guava_20_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_google_inject_guice_4_1_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_6_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_google_zxing_core_3_2_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_ibeetl_beetl_2_8_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_9_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_9_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_12.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_12.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_12.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_12.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_3_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_eventbus_0_3_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_infix_0_3_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_2_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_2_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_2_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_2_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_2_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_2_5.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_10.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__commons_jxpath_commons_jxpath_1_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_9_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_netty_netty_buffer_4_1_23_Final.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_netty_netty_codec_4_1_23_Final.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_23_Final.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_netty_netty_common_4_1_23_Final.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_netty_netty_resolver_4_1_23_Final.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_netty_netty_transport_4_1_23_Final.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_4_1_23_Final.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_23_Final.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__javax_inject_javax_inject_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__joda_time_joda_time_2_9_9.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__junit_junit_4_12.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_11.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_abego_treelayout_org_abego_treelayout_core_1_0_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_antlr_antlr4_annotations_4_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_antlr_antlr4_runtime_4_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_6.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_10.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_10_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_7_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_32.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_32.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_32.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_56.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_62.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_ehcache_ehcache_3_3_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_11_Final.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_ini4j_ini4j_0_5_4.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_3.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_jdom_jdom_1_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_owasp_encoder_encoder_1_2_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_cache_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_0_1_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_0_1_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_0_1_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_2_0_1_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_0_1_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_0_1_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_0_1_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_0_1_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_client_2_0_1_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_0_1_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_0_1_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_spring_aop_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_spring_beans_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_spring_context_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_spring_core_5_0_8_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_spring_expression_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_spring_test_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_spring_tx_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_spring_web_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_5_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserZYTravel/.idea/misc.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserZYTravel/.idea/modules.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserZYTravel/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/UserZYTravel.iml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/guns-admin/guns-admin.iml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/guns-core/guns-core.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserZYTravel/guns-core/guns-core.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../UserZYTravel/guns-generator/guns-generator.iml" beforeDir="false" afterPath="$PROJECT_DIR$/../UserZYTravel/guns-generator/guns-generator.iml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__io_lettuce_lettuce_core_5_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__io_netty_netty_handler_4_1_27_Final.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__io_projectreactor_reactor_core_3_1_8_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_0_4_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_9_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_0_9_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_0_9_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_8_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__org_springframework_spring_oxm_5_0_8_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ZuulZYTravel/.idea/libraries/Maven__org_springframework_spring_tx_5_0_8_RELEASE.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/../ZuulZYTravel/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../ZuulZYTravel/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/../ZuulZYTravel/zuul.iml" beforeDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -563,9 +144,9 @@
      </MavenGeneralSettings>
    </option>
  </component>
  <component name="ProjectColorInfo"><![CDATA[{
  "associatedIndex": 3
}]]></component>
  <component name="ProjectColorInfo">{
  &quot;associatedIndex&quot;: 3
}</component>
  <component name="ProjectFrameBounds" extendedState="7">
    <option name="x" value="60" />
    <option name="y" value="65" />
@@ -688,36 +269,31 @@
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
  <component name="PropertiesComponent"><![CDATA[{
  "keyToString": {
    "RunOnceActivity.ShowReadmeOnStart": "true",
    "RunOnceActivity.git.unshallow": "true",
    "git-widget-placeholder": "master",
    "last_opened_file_path": "E:/IDEA Workspace/ZhaoYangChuXing/DriverZYTravel",
    "nodejs_package_manager_path": "npm",
    "settings.editor.selected.configurable": "MavenSettings"
  <component name="PropertiesComponent">{
  &quot;keyToString&quot;: {
    &quot;Maven.guns-parent [clean].executor&quot;: &quot;Run&quot;,
    &quot;Maven.guns-parent [package].executor&quot;: &quot;Run&quot;,
    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
    &quot;last_opened_file_path&quot;: &quot;E:/IDEA Workspace/ZhaoYangChuXing/DriverZYTravel&quot;,
    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
    &quot;project.structure.last.edited&quot;: &quot;项目&quot;,
    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;
  }
}]]></component>
}</component>
  <component name="RecentsManager">
    <key name="CopyClassDialog.RECENTS_KEY">
      <recent name="com.stylefeng.guns.modular.system.util" />
    </key>
  </component>
  <component name="RunDashboard">
    <option name="ruleStates">
      <list>
        <RuleState>
          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
        </RuleState>
        <RuleState>
          <option name="name" value="StatusDashboardGroupingRule" />
        </RuleState>
      </list>
    </option>
  </component>
  <component name="RunManager">
    <configuration name="GunsApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
      <module name="guns-admin" />
      <module name="driver" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.stylefeng.guns.GunsApplication" />
      <method v="2">
        <option name="Make" enabled="true" />
@@ -777,8 +353,23 @@
      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
    </layout>
  </component>
  <component name="VcsContentAnnotationSettings">
    <option name="myLimit" value="2678400000" />
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="3" />
  </component>
  <component name="Vcs.Log.Tabs.Properties">
    <option name="TAB_STATES">
      <map>
        <entry key="MAIN">
          <value>
            <State />
          </value>
        </entry>
      </map>
    </option>
  </component>
  <component name="VcsManagerConfiguration">
    <MESSAGE value="修改bug" />
    <option name="LAST_COMMIT_MESSAGE" value="修改bug" />
  </component>
  <component name="editorHistoryManager">
    <entry file="file://$PROJECT_DIR$/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java">