xd
/
JNBusinessTest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
JNBusinessTest/.idea/workspace.xml

867 lines
82 KiB
XML
Raw Normal View History

'12222'
2024-06-24 16:57:12 +08:00
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
123
2024-08-01 20:51:40 +08:00
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
'12222'
2024-06-24 16:57:12 +08:00
<component name="ChangeListManager">
'222222222222'
2024-07-24 10:19:38 +08:00
<list default="true" id="0792c5b5-6584-435e-b687-895386b6c4de" name="Default Changelist" comment="11">
'123'
2024-08-02 16:53:31 +08:00
<<<<<<< HEAD
=======
123
2024-08-01 20:52:50 +08:00
<<<<<<< HEAD
123
2024-08-01 20:51:40 +08:00
<change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__c3p0_c3p0_0_9_1_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_12.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_12.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_1_2_21.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_2_21.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson2_fastjson2_2_0_43.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_83.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_dynamic_datasource_spring_boot_starter_3_5_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_2_0_5.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_carrotsearch_thirdparty_simple_xml_safe_2_7_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_12_7.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_12_7.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_12_7_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_12_7.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_12_7.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_12_7.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_12_7.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_woodstox_woodstox_core_6_2_4.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_4_5.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_oshi_oshi_core_6_5_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_3_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_4_7.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_4_7.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_06.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_5_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_30_1_1_jre.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_j2objc_j2objc_annotations_1_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jhlabs_filters_2_0_235_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_microsoft_sqlserver_mssql_jdbc_9_2_1_jre8.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mysql_mysql_connector_j_8_0_33.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_4_10_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okio_okio_jvm_3_0_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_12.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_5.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_xml_messaging_saaj_saaj_impl_1_5_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_SparseBitSet_1_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_4.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_13_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__eu_bitwalker_UserAgentUtils_1_21.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_classgraph_classgraph_4_8_83.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_9_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_lettuce_lettuce_core_6_1_10_RELEASE.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_micrometer_micrometer_core_1_7_12.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_minio_minio_8_4_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_buffer_4_1_92_Final.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_4_1_92_Final.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_dns_4_1_92_Final.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_common_4_1_92_Final.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_handler_4_1_92_Final.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_resolver_4_1_92_Final.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_resolver_dns_4_1_92_Final.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_4_1_92_Final.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_92_Final.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_projectreactor_reactor_core_3_4_29.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxjava3_rxjava_3_0_12.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_bean_validators_3_0_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_boot_starter_3_0_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_core_3_0_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_data_rest_3_0_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_oas_3_0_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_schema_3_0_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spi_3_0_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_web_3_0_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_webflux_3_0_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_webmvc_3_0_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger2_3_0_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_common_3_0_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_3_0_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_core_v3_swagger_models_2_1_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_6_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_models_1_6_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_jws_jakarta_jws_api_2_1_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_xml_soap_jakarta_xml_soap_api_1_4_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_xml_ws_jakarta_xml_ws_api_2_3_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_activation_javax_activation_api_1_2_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_cache_cache_api_1_1_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_servlet_javax_servlet_api_4_0_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__log4j_log4j_1_2_14.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_22.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_java_dev_jna_jna_5_14_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_java_dev_jna_jna_platform_5_14_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_sourceforge_jexcelapi_jxl_2_6_12.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_4.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_compress_1_21.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_12_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_math3_3_6_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_9_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_text_1_6.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_cxf_cxf_core_3_4_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_cxf_cxf_rt_bindings_soap_3_4_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_cxf_cxf_rt_bindings_xml_3_4_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_cxf_cxf_rt_databinding_jaxb_3_4_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_cxf_cxf_rt_features_metrics_3_4_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_cxf_cxf_rt_frontend_jaxws_3_4_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_cxf_cxf_rt_frontend_simple_3_4_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_cxf_cxf_rt_transports_http_3_4_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_cxf_cxf_rt_transports_http_jetty_3_4_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_cxf_cxf_rt_ws_addr_3_4_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_cxf_cxf_rt_ws_policy_3_4_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_cxf_cxf_rt_wsdl_3_4_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_cxf_cxf_spring_boot_autoconfigure_3_4_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_cxf_cxf_spring_boot_starter_jaxws_3_4_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_14.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_16.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_17_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_17_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_neethi_neethi_3_1_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_4_1_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_1_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_1_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_75.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_75.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_75.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_ws_xmlschema_xmlschema_core_2_2_5.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_1_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_7.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_70.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_69.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcutil_jdk15on_1_70.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_checkerframework_checker_qual_3_8_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_4_2_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jetty_jetty_continuation_9_4_51_v20230217.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_4_51_v20230217.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_4_51_v20230217.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_4_51_v20230217.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_4_51_v20230217.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_4_51_v20230217.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_freemarker_freemarker_2_3_32.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_core_2_3_0_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_8.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_8.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_12.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_2_5_Final.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jasig_cas_client_cas_client_core_3_6_4.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_java_websocket_java_websocket_1_3_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_3_Final.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_marshalling_jboss_marshalling_2_0_11_Final.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_marshalling_jboss_marshalling_river_2_0_11_Final.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_annotations_13_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_1_5_32.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_common_1_5_32.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_5_32.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_5_32.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jodd_jodd_bean_5_1_6.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jodd_jodd_core_5_1_6.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20180813.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jvnet_staxex_stax_ex_1_8_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_1_3_1_Final.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_4_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_5_13.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_1_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_2_3_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_2_3_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_18_26.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_4.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_redisson_redisson_3_16_4.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_redisson_redisson_spring_boot_starter_3_16_4.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_redisson_redisson_spring_data_25_3_16_4.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_36.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_36.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_5_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_5_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_5_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_5_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_5_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_5_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_5_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_5_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_5_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_5_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_5_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_5_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_security_2_5_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_5_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_5_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_5_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_services_2_5_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_5_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_5_12.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_5_12.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_5_12.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_2_0_0_RELEASE.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_2_0_0_RELEASE.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_cas_5_5_8.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_config_5_5_8.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_core_5_5_8.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_5_8.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_web_5_5_8.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_3_33.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_3_33.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_3_33.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_5_3_33.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_3_33.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_3_33.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_3_33.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_3_33.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_messaging_5_3_33.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_oxm_5_3_33.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_2_12_RELEASE.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_3_33.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_3_33.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_3_33.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_websocket_5_3_33.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_ws_spring_ws_core_3_1_6.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_ws_spring_xml_3_1_6.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ssssssss_magic_api_2_0_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ssssssss_magic_api_spring_boot_starter_2_0_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ssssssss_magic_editor_2_0_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ssssssss_magic_script_1_8_5.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_xerial_snappy_snappy_java_1_1_8_4.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_28.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__pro_fessional_kaptcha_2_3_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__wsdl4j_wsdl4j_1_6_3.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xml_resolver_xml_resolver_1_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.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$/ruoyi-admin/ruoyi-admin.iml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/ruoyi-admin.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-common/ruoyi-common.iml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-common/ruoyi-common.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-framework/ruoyi-framework.iml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/ruoyi-framework.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/ruoyi-generator.iml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/ruoyi-generator.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/ruoyi-quartz.iml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/ruoyi-quartz.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/ruoyi-system.iml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/ruoyi-system.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi.iml" beforeDir="false" />
123
2024-08-01 20:52:50 +08:00
=======
'123'
2024-08-01 17:23:46 +08:00
<change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizeController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/expenses/ExpensesController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/registeredCompany/RegisteredCompanyController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/OASysZgys.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/OAZgysMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/OAZgysService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/OAZgysServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/ZgysTask.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/resources/mapper/quartz/OAZgysMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/authorize/domain/Authorize.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/authorize/domain/AuthorizeFile.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/authorize/domain/SysOaAuthorize.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/authorize/mapper/AuthorizeFileMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/authorize/mapper/AuthorizeMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/authorize/service/IAuthorizeFileService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/authorize/service/IAuthorizeService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/authorize/service/impl/AuthorizeFileServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/authorize/service/impl/AuthorizeServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/expenses/domain/Expenses.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/expenses/mapper/ExpensesMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/expenses/service/IExpensesService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/expenses/service/impl/ExpensesServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/registeredCompany/domain/RegisteredCompany.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/registeredCompany/mapper/RegisteredCompanyMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/registeredCompany/service/IRegisteredCompanyService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/registeredCompany/service/impl/RegisteredCompanyServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/zgys/domain/SysOaZgys.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeFileMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/registeredCompany/RegisteredCompanyMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-ui/src/api/authorize/authorize.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-ui/src/api/expenses/expenses.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-ui/src/api/registeredCompany/registeredCompany.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/authorize/authorize/index.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/expenses/expenses/index.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/registeredCompany/registeredCompany/index.vue" afterDir="false" />
'123'
2024-08-02 16:53:31 +08:00
>>>>>>> 86910e81db80c5a7079e2611ac4436d156c75623
'123'
2024-08-01 17:23:46 +08:00
<change beforePath="$PROJECT_DIR$/ABAP_AS_WITH_POOL.jcoDestination" beforeDir="false" afterPath="$PROJECT_DIR$/ABAP_AS_WITH_POOL.jcoDestination" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java" afterDir="false" />
'1111'
2024-07-26 17:14:23 +08:00
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java" afterDir="false" />
'123'
2024-08-02 16:51:56 +08:00
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapFunction/SapRfcUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapFunction/SapRfcUtils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapHana/SapHanaUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/utils/SapHana/SapHanaUtils.java" afterDir="false" />
'123'
2024-08-01 17:23:46 +08:00
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/quot/QuotController.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/controller/quot/QuotController.class" afterDir="false" />
'123'
2024-08-02 16:51:56 +08:00
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/SapHana/SapHanaUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/classes/com/ruoyi/web/utils/SapHana/SapHanaUtils.class" afterDir="false" />
'123'
2024-08-01 17:23:46 +08:00
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/ruoyi-admin.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/ruoyi-admin.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-admin/target/ruoyi-admin.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/target/ruoyi-admin.jar.original" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-common/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-common/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-common/target/ruoyi-common-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-common/target/ruoyi-common-3.8.7.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-framework/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-framework/target/ruoyi-framework-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/target/ruoyi-framework-3.8.7.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-generator/target/ruoyi-generator-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-generator/target/ruoyi-generator-3.8.7.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java" afterDir="false" />
'123'
2024-08-02 16:51:56 +08:00
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/mapper/BidMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/mapper/BidMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/service/IBidService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/bid/service/IBidService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/priceVerification/domain/BidHj.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/priceVerification/domain/BidHj.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/BidJsqr.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/BidJsqr.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/mapper/BidJsqrMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/mapper/BidJsqrMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/service/IBidJsqrService.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/service/IBidJsqrService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/service/impl/BidJsqrServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/service/impl/BidJsqrServiceImpl.java" afterDir="false" />
'123'
2024-08-01 17:23:46 +08:00
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/priceVerification/BidHjMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/priceVerification/BidHjMapper.xml" afterDir="false" />
'123'
2024-08-02 16:51:56 +08:00
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml" afterDir="false" />
'123'
2024-08-01 17:23:46 +08:00
<change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/technicalConfirm/BidJsqrMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper/technicalConfirm/BidJsqrMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/bid/domain/Bid.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/bid/domain/Bid.class" afterDir="false" />
'123'
2024-08-02 16:51:56 +08:00
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/priceVerification/domain/BidHj.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/priceVerification/domain/BidHj.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/mapper/QuotMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/mapper/QuotMapper.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/service/IQuotService.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/service/IQuotService.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/service/impl/QuotServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/quot/service/impl/QuotServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/registeredCompany/domain/RegisteredCompany.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/registeredCompany/domain/RegisteredCompany.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/technicalConfirm/domain/BidJsqr.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/technicalConfirm/domain/BidJsqr.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/technicalConfirm/mapper/BidJsqrMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/technicalConfirm/mapper/BidJsqrMapper.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/technicalConfirm/service/IBidJsqrService.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/technicalConfirm/service/IBidJsqrService.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/technicalConfirm/service/impl/BidJsqrServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/com/ruoyi/technicalConfirm/service/impl/BidJsqrServiceImpl.class" afterDir="false" />
'123'
2024-08-01 17:23:46 +08:00
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/bid/BidMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/bid/BidMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/priceVerification/BidHjMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/priceVerification/BidHjMapper.xml" afterDir="false" />
'123'
2024-08-02 16:51:56 +08:00
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/quot/QuotMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/quot/QuotMapper.xml" afterDir="false" />
'123'
2024-08-01 17:23:46 +08:00
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/technicalConfirm/BidJsqrMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/classes/mapper/technicalConfirm/BidJsqrMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-system/target/ruoyi-system-3.8.7.jar" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/target/ruoyi-system-3.8.7.jar" afterDir="false" />
'123'
2024-08-02 16:51:56 +08:00
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/api/bid/bid.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/api/bid/bid.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/api/quot/quot.js" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/api/quot/quot.js" afterDir="false" />
'123'
2024-08-01 17:23:46 +08:00
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/bid/bid/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/bid/bid/index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfoBid.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfoBid.vue" afterDir="false" />
'123'
2024-08-02 16:51:56 +08:00
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/quot/quot/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/quot/quot/index.vue" afterDir="false" />
'123'
2024-08-01 17:23:46 +08:00
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfoBid.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfoBid.vue" afterDir="false" />
'123'
2024-08-02 16:53:31 +08:00
<<<<<<< HEAD
=======
'123'
2024-08-01 17:23:46 +08:00
<change beforePath="$PROJECT_DIR$/ruoyi-ui/src/views/zgys/zgys/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/views/zgys/zgys/index.vue" afterDir="false" />
123
2024-08-01 20:52:50 +08:00
>>>>>>> 5198921374dd01664dbc898956e7868edc9d8ecf
'123'
2024-08-02 16:53:31 +08:00
>>>>>>> 86910e81db80c5a7079e2611ac4436d156c75623
'222222222222'
2024-07-24 10:19:38 +08:00
</list>
'12222'
2024-06-24 16:57:12 +08:00
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
'12'
2024-07-24 14:53:01 +08:00
<component name="CompilerWorkspaceConfiguration">
<option name="MAKE_PROJECT_ON_SAVE" value="true" />
<option name="PARALLEL_COMPILATION" value="true" />
</component>
'12222'
2024-06-24 16:57:12 +08:00
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Vue Single File Component" />
<option value="Class" />
</list>
</option>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
123
2024-08-01 20:51:40 +08:00
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
'12'
2024-07-24 14:53:01 +08:00
</component>
'12222'
2024-06-24 16:57:12 +08:00
<component name="MavenImportPreferences">
<option name="generalSettings">
<MavenGeneralSettings>
123
2024-08-01 20:51:40 +08:00
<option name="mavenHome" value="D:\maven\apache-maven-3.9.6" />
<option name="userSettingsFile" value="D:\maven\apache-maven-3.9.6\conf\settings.xml" />
'12222'
2024-06-24 16:57:12 +08:00
</MavenGeneralSettings>
</option>
</component>
<component name="MavenRunner">
<option name="delegateBuildToMaven" value="true" />
<option name="jreName" value="1.8" />
</component>
123
2024-08-01 20:51:40 +08:00
<component name="ProjectColorInfo">{
&quot;associatedIndex&quot;: 7
}</component>
'12222'
2024-06-24 16:57:12 +08:00
<component name="ProjectId" id="2ctda9hinWFET2tU9A21u0yPxNJ" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState">
<option name="flattenModules" value="true" />
<option name="showLibraryContents" value="true" />
</component>
123
2024-08-01 20:52:50 +08:00
<<<<<<< HEAD
123
2024-08-01 20:51:40 +08:00
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"Maven.ruoyi [clean].executor": "Run",
"Maven.ruoyi [install].executor": "Run",
"Maven.ruoyi-admin [install].executor": "Run",
"Maven.ruoyi-admin [resources:resources].executor": "Run",
"RequestMappingsPanelOrder0": "0",
"RequestMappingsPanelOrder1": "1",
"RequestMappingsPanelWidth0": "75",
"RequestMappingsPanelWidth1": "75",
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"Spring Boot.RuoYiApplication.executor": "Run",
"git-widget-placeholder": "main",
"kotlin-language-version-configured": "true",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"settings.editor.selected.configurable": "preferences.fileTypes",
"vue.rearranger.settings.migration": "true"
}
}]]></component>
123
2024-08-01 20:52:50 +08:00
=======
'12222'
2024-06-24 16:57:12 +08:00
<component name="PropertiesComponent">
<property name="RequestMappingsPanelOrder0" value="0" />
<property name="RequestMappingsPanelOrder1" value="1" />
<property name="RequestMappingsPanelWidth0" value="75" />
<property name="RequestMappingsPanelWidth1" value="75" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
'123'
2024-08-01 17:23:46 +08:00
<property name="last_opened_file_path" value="$PROJECT_DIR$/ruoyi-system/src/main/resources/mapper" />
'12222'
2024-06-24 16:57:12 +08:00
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.43728423" />
'12'
2024-07-24 14:53:01 +08:00
<property name="settings.editor.selected.configurable" value="project.propCompiler" />
'12222'
2024-06-24 16:57:12 +08:00
</component>
123
2024-08-01 20:52:50 +08:00
>>>>>>> 5198921374dd01664dbc898956e7868edc9d8ecf
'12222'
2024-06-24 16:57:12 +08:00
<component name="ReactorSettings">
<option name="notificationShown" value="true" />
</component>
<component name="RecentsManager">
'1111'
2024-07-26 17:11:36 +08:00
<key name="CopyFile.RECENT_KEYS">
'123'
2024-08-01 17:23:46 +08:00
<recent name="E:\myproject\JNBusinessTest\ruoyi-system\src\main\resources\mapper" />
<recent name="E:\myproject\JNBusinessTest\ruoyi-ui\src\views" />
<recent name="E:\myproject\JNBusinessTest\ruoyi-ui\src\api" />
<recent name="E:\myproject\JNBusinessTest\ruoyi-system\src\main\java\com\ruoyi\registeredCompany" />
<recent name="E:\myproject\JNBusinessTest\ruoyi-admin\src\main\java\com\ruoyi\web\controller\registeredCompany" />
'12222'
2024-06-24 16:57:12 +08:00
</key>
<key name="CopyClassDialog.RECENTS_KEY">
'123'
2024-08-01 17:23:46 +08:00
<recent name="com.ruoyi.authorize.domain" />
<recent name="com.ruoyi.quartz.mapper" />
<recent name="com.ruoyi.quartz.service.impl" />
'12222'
2024-06-24 16:57:12 +08:00
<recent name="com.ruoyi.quartz.domain" />
'123'
2024-08-01 17:23:46 +08:00
<recent name="com.ruoyi.quartz.service" />
'12222'
2024-06-24 16:57:12 +08:00
</key>
'1111'
2024-07-26 17:11:36 +08:00
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\myproject\JNBusinessTest\ruoyi-ui\src\directive\tableFit" />
<recent name="E:\myproject\RuoYi-Vue\ruoyi-admin\src\main\resources\temp" />
<recent name="E:\myproject\RuoYi-Vue\ruoyi-ui\src\api\technicalConfirm\technicalConfirm" />
<recent name="E:\myproject\RuoYi-Vue\ruoyi-ui\src\views\technicalConfirm\technicalConfirm" />
'12222'
2024-06-24 16:57:12 +08:00
</key>
</component>
<component name="RunManager">
<configuration name="RuoYiApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
123
2024-08-01 20:51:40 +08:00
<option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateResources" />
'12222'
2024-06-24 16:57:12 +08:00
<module name="ruoyi-admin" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.ruoyi.RuoYiApplication" />
'12'
2024-07-24 14:53:01 +08:00
<option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateResources" />
'12222'
2024-06-24 16:57:12 +08:00
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
123
2024-08-01 20:51:40 +08:00
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
'12222'
2024-06-24 16:57:12 +08:00
<component name="SvnConfiguration">
<configuration>C:\Users\Administrator\AppData\Roaming\Subversion</configuration>
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="0792c5b5-6584-435e-b687-895386b6c4de" name="Default Changelist" comment="" />
<created>1708934869765</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1708934869765</updated>
<workItem from="1708934873823" duration="2807000" />
<workItem from="1708992209310" duration="21548000" />
<workItem from="1709078216260" duration="24445000" />
<workItem from="1709164765566" duration="23699000" />
<workItem from="1709251995680" duration="4749000" />
<workItem from="1709257160220" duration="2707000" />
<workItem from="1709259919385" duration="13259000" />
<workItem from="1709512581815" duration="17901000" />
<workItem from="1709607025520" duration="14093000" />
<workItem from="1709683514001" duration="24259000" />
<workItem from="1709770666404" duration="15391000" />
<workItem from="1710028606184" duration="14711000" />
<workItem from="1710115515008" duration="20354000" />
<workItem from="1710201747690" duration="19338000" />
<workItem from="1710288255244" duration="12050000" />
<workItem from="1710373938841" duration="25448000" />
<workItem from="1710460752597" duration="27805000" />
<workItem from="1710719823776" duration="26933000" />
<workItem from="1710807076300" duration="22779000" />
<workItem from="1710893798906" duration="18472000" />
<workItem from="1710979589390" duration="21226000" />
<workItem from="1711237543580" duration="10267000" />
<workItem from="1711257661933" duration="3110000" />
<workItem from="1711268418563" duration="599000" />
<workItem from="1711331890130" duration="3413000" />
<workItem from="1711341416318" duration="9407000" />
<workItem from="1711411494564" duration="21292000" />
<workItem from="1711437167549" duration="5398000" />
<workItem from="1711497289214" duration="18547000" />
<workItem from="1711929999596" duration="20919000" />
<workItem from="1712016133977" duration="23771000" />
<workItem from="1712102333158" duration="19725000" />
<workItem from="1712447956010" duration="24986000" />
<workItem from="1712534269145" duration="24162000" />
<workItem from="1712621114621" duration="12247000" />
<workItem from="1712638259170" duration="11030000" />
<workItem from="1712707504096" duration="12655000" />
<workItem from="1712725113935" duration="8537000" />
<workItem from="1712793813084" duration="228000" />
<workItem from="1712795242503" duration="23577000" />
<workItem from="1712880749987" duration="15075000" />
<workItem from="1713145201373" duration="16944000" />
<workItem from="1713226130725" duration="15991000" />
<workItem from="1713312152837" duration="17437000" />
<workItem from="1713400502392" duration="22771000" />
<workItem from="1713487333931" duration="18705000" />
<workItem from="1713658141848" duration="8415000" />
<workItem from="1713676184258" duration="4888000" />
<workItem from="1713684998816" duration="622000" />
<workItem from="1713754659517" duration="9733000" />
<workItem from="1713836303764" duration="8110000" />
<workItem from="1713917095718" duration="29358000" />
<workItem from="1714003218438" duration="27289000" />
<workItem from="1714089546746" duration="26282000" />
<workItem from="1714262994867" duration="26250000" />
<workItem from="1714348547993" duration="24952000" />
<workItem from="1714434819225" duration="27094000" />
<workItem from="1714953355335" duration="26481000" />
<workItem from="1715040291738" duration="16380000" />
<workItem from="1715126266306" duration="6450000" />
<workItem from="1715212983801" duration="27163000" />
<workItem from="1715302172741" duration="18301000" />
<workItem from="1715471990639" duration="32906000" />
<workItem from="1715558368294" duration="20495000" />
<workItem from="1715644893034" duration="25873000" />
<workItem from="1715730923851" duration="18034000" />
<workItem from="1715818103592" duration="23256000" />
<workItem from="1715903292525" duration="24079000" />
<workItem from="1716163421797" duration="20545000" />
<workItem from="1716249745446" duration="21113000" />
<workItem from="1716336130878" duration="22571000" />
<workItem from="1716422420466" duration="24597000" />
<workItem from="1716508979458" duration="24494000" />
<workItem from="1716768082110" duration="26160000" />
<workItem from="1716800656524" duration="1427000" />
<workItem from="1716854113177" duration="24318000" />
<workItem from="1716940600675" duration="23239000" />
<workItem from="1717028386006" duration="24349000" />
<workItem from="1717114244292" duration="26890000" />
<workItem from="1717372654741" duration="21956000" />
<workItem from="1717458921442" duration="17618000" />
<workItem from="1717547750440" duration="21940000" />
<workItem from="1717632443787" duration="6958000" />
<workItem from="1717643449804" duration="3427000" />
<workItem from="1717652380132" duration="11396000" />
<workItem from="1717718446495" duration="12677000" />
<workItem from="1717739898496" duration="6125000" />
<workItem from="1717982523385" duration="17855000" />
<workItem from="1718063586920" duration="22956000" />
<workItem from="1718149991719" duration="23558000" />
<workItem from="1718236511225" duration="27660000" />
<workItem from="1718322490534" duration="15792000" />
<workItem from="1718410989196" duration="23358000" />
<workItem from="1718581946943" duration="28773000" />
<workItem from="1718669101927" duration="26574000" />
<workItem from="1718754759402" duration="27031000" />
<workItem from="1718842123607" duration="22971000" />
<workItem from="1718928338779" duration="18373000" />
<workItem from="1719186299111" duration="13650000" />
<workItem from="1719208445295" duration="2599000" />
'12'
2024-07-24 14:53:01 +08:00
<workItem from="1721785568617" duration="1859000" />
<workItem from="1721791542825" duration="3331000" />
'123'
2024-07-25 09:32:29 +08:00
<workItem from="1721800088839" duration="12061000" />
'1111'
2024-07-26 17:11:36 +08:00
<workItem from="1721866002818" duration="24322000" />
<workItem from="1721951870703" duration="19853000" />
123
2024-08-01 20:52:50 +08:00
<<<<<<< HEAD
'1111'
2024-07-26 17:14:23 +08:00
<workItem from="1721978213485" duration="6980000" />
123
2024-08-01 20:51:40 +08:00
<workItem from="1722002806505" duration="758000" />
<workItem from="1722003584528" duration="27000" />
<workItem from="1722516101227" duration="510000" />
123
2024-08-01 20:52:50 +08:00
=======
'123'
2024-08-01 17:23:46 +08:00
<workItem from="1721978213485" duration="7292000" />
<workItem from="1722038694929" duration="24967000" />
<workItem from="1722297018958" duration="27538000" />
<workItem from="1722383807059" duration="24407000" />
'123'
2024-08-02 16:53:31 +08:00
<<<<<<< HEAD
'123'
2024-08-02 16:51:56 +08:00
<workItem from="1722470173914" duration="22292000" />
<workItem from="1722556913672" duration="24396000" />
'123'
2024-08-02 16:53:31 +08:00
=======
'123'
2024-08-01 17:23:46 +08:00
<workItem from="1722470173914" duration="21568000" />
123
2024-08-01 20:52:50 +08:00
>>>>>>> 5198921374dd01664dbc898956e7868edc9d8ecf
'123'
2024-08-02 16:53:31 +08:00
>>>>>>> 86910e81db80c5a7079e2611ac4436d156c75623
'12222'
2024-06-24 16:57:12 +08:00
</task>
<task id="LOCAL-00001" summary="11">
<created>1709259560561</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1709259560562</updated>
</task>
<task id="LOCAL-00002" summary="11">
<created>1709259795616</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1709259795616</updated>
</task>
<task id="LOCAL-00003" summary="11">
<created>1709628256861</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1709628256861</updated>
</task>
<option name="localTasksCounter" value="4" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
123
2024-08-01 20:51:40 +08:00
<option name="version" value="3" />
'12222'
2024-06-24 16:57:12 +08:00
</component>
<component name="Vcs.Log.History.Properties">
<option name="COLUMN_ORDER">
<list>
<option value="0" />
<option value="2" />
<option value="3" />
<option value="1" />
</list>
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="11" />
<option name="LAST_COMMIT_MESSAGE" value="11" />
</component>
123
2024-08-01 20:52:50 +08:00
<<<<<<< HEAD
=======
'12222'
2024-06-24 16:57:12 +08:00
<component name="WindowStateProjectService">
'12'
2024-07-24 14:53:01 +08:00
<state x="746" y="151" width="1174" height="599" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1721799805055">
<screen x="0" y="0" width="1920" height="1040" />
'12222'
2024-06-24 16:57:12 +08:00
</state>
<state x="414" y="174" width="1174" height="692" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1717740286739" />
'12'
2024-07-24 14:53:01 +08:00
<state x="746" y="151" width="1174" height="599" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1721799805055" />
'123'
2024-08-02 16:51:56 +08:00
<state x="2494" y="176" key="#com.intellij.ide.util.MemberChooser" timestamp="1722587209446">
<screen x="1920" y="0" width="1440" height="900" />
'12222'
2024-06-24 16:57:12 +08:00
</state>
'123'
2024-08-02 16:51:56 +08:00
<state x="765" y="203" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722577943413" />
<state x="2494" y="176" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722587209446" />
'12222'
2024-06-24 16:57:12 +08:00
<state x="736" y="386" width="447" height="276" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes" timestamp="1717554227324">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="736" y="386" width="447" height="276" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1717554227324" />
<state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog" timestamp="1717651521430">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="0" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1717651521430" />
<state x="1920" y="0" key="#com.intellij.refactoring.rename.AutomaticRenamingDialog/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1717644305671" />
'1111'
2024-07-26 17:11:36 +08:00
<state x="715" y="221" key="#xdebugger.evaluate" timestamp="1721962740478">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="715" y="221" key="#xdebugger.evaluate/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1721962740478" />
'123'
2024-08-02 16:51:56 +08:00
<state x="558" y="83" width="953" height="879" key="CommitChangelistDialog2" timestamp="1722560377892">
<screen x="0" y="0" width="1920" height="1040" />
'12222'
2024-06-24 16:57:12 +08:00
</state>
'123'
2024-08-02 16:51:56 +08:00
<state x="558" y="83" width="953" height="879" key="CommitChangelistDialog2/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722560377892" />
'123'
2024-07-25 09:32:29 +08:00
<state x="2339" y="21" key="CommitChangelistDialog2/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1721803892785" />
'123'
2024-08-01 17:23:46 +08:00
<state width="515" height="466" key="DebuggerActiveHint" timestamp="1722480999882">
'12222'
2024-06-24 16:57:12 +08:00
<screen x="0" y="0" width="1920" height="1040" />
</state>
'123'
2024-08-01 17:23:46 +08:00
<state width="515" height="466" key="DebuggerActiveHint/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722480999882" />
<state width="500" height="404" key="DebuggerActiveHint/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722472652875" />
<state x="302" y="-25" width="1302" height="741" key="DiffContextDialog" timestamp="1722323194885">
'12222'
2024-06-24 16:57:12 +08:00
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="184" y="0" width="1736" height="856" key="DiffContextDialog/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1718679587513" />
'123'
2024-08-01 17:23:46 +08:00
<state x="302" y="-25" width="1302" height="741" key="DiffContextDialog/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722323194885" />
'12222'
2024-06-24 16:57:12 +08:00
<state x="2561" y="132" key="FileChooserDialogImpl" timestamp="1719207686863">
<screen x="1920" y="0" width="1440" height="900" />
</state>
<state x="854" y="153" key="FileChooserDialogImpl/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1717652588812" />
<state x="2561" y="132" key="FileChooserDialogImpl/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1719207686863" />
'123'
2024-08-02 16:51:56 +08:00
<state width="1396" height="158" key="GridCell.Tab.0.bottom" timestamp="1722588415830">
<screen x="1920" y="0" width="1440" height="900" />
'12222'
2024-06-24 16:57:12 +08:00
</state>
'123'
2024-08-02 16:51:56 +08:00
<state width="1876" height="149" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722584450842" />
<state width="1396" height="158" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722588415830" />
<state width="1396" height="158" key="GridCell.Tab.0.center" timestamp="1722588415829">
<screen x="1920" y="0" width="1440" height="900" />
'12222'
2024-06-24 16:57:12 +08:00
</state>
'123'
2024-08-02 16:51:56 +08:00
<state width="1876" height="149" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722584450842" />
<state width="1396" height="158" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722588415829" />
<state width="1396" height="158" key="GridCell.Tab.0.left" timestamp="1722588415829">
<screen x="1920" y="0" width="1440" height="900" />
'12222'
2024-06-24 16:57:12 +08:00
</state>
'123'
2024-08-02 16:51:56 +08:00
<state width="1876" height="149" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722584450842" />
<state width="1396" height="158" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722588415829" />
<state width="1396" height="158" key="GridCell.Tab.0.right" timestamp="1722588415829">
<screen x="1920" y="0" width="1440" height="900" />
'12222'
2024-06-24 16:57:12 +08:00
</state>
'123'
2024-08-02 16:51:56 +08:00
<state width="1876" height="149" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722584450842" />
<state width="1396" height="158" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722588415829" />
<state width="1396" height="158" key="GridCell.Tab.1.bottom" timestamp="1722588130276">
<screen x="1920" y="0" width="1440" height="900" />
'12222'
2024-06-24 16:57:12 +08:00
</state>
'123'
2024-08-02 16:51:56 +08:00
<state width="1876" height="149" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722584450842" />
<state width="1396" height="158" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722588130276" />
<state width="1396" height="158" key="GridCell.Tab.1.center" timestamp="1722588130276">
<screen x="1920" y="0" width="1440" height="900" />
'12222'
2024-06-24 16:57:12 +08:00
</state>
'123'
2024-08-02 16:51:56 +08:00
<state width="1876" height="149" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722584450842" />
<state width="1396" height="158" key="GridCell.Tab.1.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722588130276" />
<state width="1396" height="158" key="GridCell.Tab.1.left" timestamp="1722588130276">
<screen x="1920" y="0" width="1440" height="900" />
'12222'
2024-06-24 16:57:12 +08:00
</state>
'123'
2024-08-02 16:51:56 +08:00
<state width="1876" height="149" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722584450842" />
<state width="1396" height="158" key="GridCell.Tab.1.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722588130276" />
<state width="1396" height="158" key="GridCell.Tab.1.right" timestamp="1722588130276">
<screen x="1920" y="0" width="1440" height="900" />
'12222'
2024-06-24 16:57:12 +08:00
</state>
'123'
2024-08-02 16:51:56 +08:00
<state width="1876" height="149" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722584450842" />
<state width="1396" height="158" key="GridCell.Tab.1.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722588130276" />
<state width="1876" height="297" key="GridCell.Tab.2.bottom" timestamp="1722504275272">
'12222'
2024-06-24 16:57:12 +08:00
<screen x="0" y="0" width="1920" height="1040" />
</state>
'123'
2024-08-02 16:51:56 +08:00
<state width="1876" height="297" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722504275272" />
'123'
2024-08-01 17:23:46 +08:00
<state width="1396" height="75" key="GridCell.Tab.2.bottom/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722472794696" />
'123'
2024-08-02 16:51:56 +08:00
<state width="1876" height="297" key="GridCell.Tab.2.center" timestamp="1722504275272">
'12222'
2024-06-24 16:57:12 +08:00
<screen x="0" y="0" width="1920" height="1040" />
</state>
'123'
2024-08-02 16:51:56 +08:00
<state width="1876" height="297" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722504275272" />
'123'
2024-08-01 17:23:46 +08:00
<state width="1396" height="75" key="GridCell.Tab.2.center/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722472794695" />
'123'
2024-08-02 16:51:56 +08:00
<state width="1876" height="297" key="GridCell.Tab.2.left" timestamp="1722504275272">
'12222'
2024-06-24 16:57:12 +08:00
<screen x="0" y="0" width="1920" height="1040" />
</state>
'123'
2024-08-02 16:51:56 +08:00
<state width="1876" height="297" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722504275272" />
'123'
2024-08-01 17:23:46 +08:00
<state width="1396" height="75" key="GridCell.Tab.2.left/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722472794695" />
'123'
2024-08-02 16:51:56 +08:00
<state width="1876" height="297" key="GridCell.Tab.2.right" timestamp="1722504275272">
'12222'
2024-06-24 16:57:12 +08:00
<screen x="0" y="0" width="1920" height="1040" />
</state>
'123'
2024-08-02 16:51:56 +08:00
<state width="1876" height="297" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722504275272" />
'123'
2024-08-01 17:23:46 +08:00
<state width="1396" height="75" key="GridCell.Tab.2.right/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722472794696" />
'12222'
2024-06-24 16:57:12 +08:00
<state x="2325" y="219" key="IDE.errors.dialog" timestamp="1717721579924">
<screen x="1920" y="0" width="1440" height="900" />
</state>
<state x="2325" y="219" key="IDE.errors.dialog/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1717721579924" />
<state x="2288" y="151" key="Maven.ArtifactSearchDialog" timestamp="1718761132551">
<screen x="1920" y="0" width="1440" height="900" />
</state>
<state x="195" y="303" key="Maven.ArtifactSearchDialog/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1717740144424" />
<state x="2288" y="151" key="Maven.ArtifactSearchDialog/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1718761132551" />
'12'
2024-07-24 14:53:01 +08:00
<state x="2211" y="264" key="Registry" timestamp="1721799784859">
<screen x="1920" y="0" width="1440" height="900" />
</state>
<state x="2211" y="264" key="Registry/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1721799784859" />
'123'
2024-08-02 16:51:56 +08:00
<state x="765" y="220" key="RollbackChangesDialog" timestamp="1722560399268">
<screen x="0" y="0" width="1920" height="1040" />
'12222'
2024-06-24 16:57:12 +08:00
</state>
'123'
2024-08-02 16:51:56 +08:00
<state x="765" y="220" key="RollbackChangesDialog/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722560399268" />
'12222'
2024-06-24 16:57:12 +08:00
<state x="2494" y="190" key="RollbackChangesDialog/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1718777808503" />
'12'
2024-07-24 14:53:01 +08:00
<state x="2052" y="100" key="SettingsEditor" timestamp="1721800288822">
<screen x="1920" y="0" width="1440" height="900" />
'12222'
2024-06-24 16:57:12 +08:00
</state>
<state x="575" y="44" key="SettingsEditor/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1718322623366" />
'12'
2024-07-24 14:53:01 +08:00
<state x="2052" y="100" key="SettingsEditor/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1721800288822" />
'12222'
2024-06-24 16:57:12 +08:00
<state x="2121" y="42" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1717478112703">
<screen x="1920" y="0" width="1440" height="900" />
</state>
<state x="2121" y="42" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1717478112703" />
'123'
2024-08-01 17:23:46 +08:00
<state x="753" y="432" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1722065912078">
'12222'
2024-06-24 16:57:12 +08:00
<screen x="0" y="0" width="1920" height="1040" />
</state>
'123'
2024-08-01 17:23:46 +08:00
<state x="753" y="432" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722065912078" />
'12222'
2024-06-24 16:57:12 +08:00
<state x="2180" y="178" key="com.intellij.xdebugger.impl.breakpoints.ui.BreakpointsDialogFactory$2" timestamp="1718164878415">
<screen x="1920" y="0" width="1440" height="900" />
</state>
<state x="2180" y="178" key="com.intellij.xdebugger.impl.breakpoints.ui.BreakpointsDialogFactory$2/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1718164878415" />
'123'
2024-08-02 16:51:56 +08:00
<state x="874" y="0" width="1044" height="876" maximized="true" key="dock-window-1" timestamp="1722581950070">
<screen x="0" y="0" width="1920" height="1040" />
'12222'
2024-06-24 16:57:12 +08:00
</state>
'123'
2024-08-01 17:23:46 +08:00
<state x="1912" y="-8" width="1013" height="875" maximized="true" key="dock-window-1/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722481518245" />
'123'
2024-08-02 16:51:56 +08:00
<state x="874" y="0" width="1044" height="876" maximized="true" key="dock-window-1/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722581950070" />
'123'
2024-08-01 17:23:46 +08:00
<state x="1920" y="0" width="1229" height="717" key="dock-window-2" timestamp="1722481248236">
'12222'
2024-06-24 16:57:12 +08:00
<screen x="1920" y="0" width="1440" height="900" />
</state>
'123'
2024-08-01 17:23:46 +08:00
<state x="1920" y="0" width="1229" height="717" key="dock-window-2/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722481248236" />
<state x="406" y="0" width="1074" height="875" maximized="true" key="dock-window-2/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722325557312" />
<state x="2056" y="-8" width="1456" height="989" maximized="true" key="dock-window-3" timestamp="1722064256400">
'12222'
2024-06-24 16:57:12 +08:00
<screen x="1920" y="0" width="1440" height="900" />
</state>
'123'
2024-08-01 17:23:46 +08:00
<state x="2056" y="-8" width="1456" height="989" maximized="true" key="dock-window-3/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722064256400" />
<state x="-8" y="-8" width="1055" height="875" maximized="true" key="dock-window-4" timestamp="1722297332143">
<screen x="0" y="0" width="1920" height="1040" />
</state>
'12222'
2024-06-24 16:57:12 +08:00
<state x="1920" y="0" width="1456" height="912" key="dock-window-4/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1718260153943" />
'123'
2024-08-01 17:23:46 +08:00
<state x="-8" y="-8" width="1055" height="875" maximized="true" key="dock-window-4/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722297332143" />
'12222'
2024-06-24 16:57:12 +08:00
<state x="237" y="42" width="1456" height="989" key="dock-window-5" timestamp="1715501617744">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="237" y="42" width="1456" height="989" key="dock-window-5/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1715501617744" />
<state x="690" y="292" key="extract.method.dialog" timestamp="1714106219856">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="690" y="292" key="extract.method.dialog/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1714106219856" />
'123'
2024-08-02 16:51:56 +08:00
<state x="2093" y="316" width="999" height="584" key="find.popup" timestamp="1722559853874">
<screen x="1920" y="0" width="1440" height="900" />
'12222'
2024-06-24 16:57:12 +08:00
</state>
'123'
2024-08-01 17:23:46 +08:00
<state x="606" y="189" width="999" height="584" key="find.popup/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1722415521933" />
'123'
2024-08-02 16:51:56 +08:00
<state x="2093" y="316" width="999" height="584" key="find.popup/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722559853874" />
'12222'
2024-06-24 16:57:12 +08:00
<state x="501" y="231" key="run.anything.popup" timestamp="1716511895427">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="501" y="231" key="run.anything.popup/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1716511895427" />
<state x="2296" y="200" key="run.anything.popup/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1716250454079" />
'123'
2024-08-02 16:51:56 +08:00
<state x="2382" y="140" width="672" height="160" key="search.everywhere.popup" timestamp="1722559733723">
'123'
2024-08-01 17:23:46 +08:00
<screen x="1920" y="0" width="1440" height="900" />
'12222'
2024-06-24 16:57:12 +08:00
</state>
<state x="616" y="162" width="672" height="160" key="search.everywhere.popup/0.0.1920.1040/1920.0.1440.900@0.0.1920.1040" timestamp="1714962133734" />
'123'
2024-08-02 16:51:56 +08:00
<state x="2382" y="140" width="672" height="160" key="search.everywhere.popup/0.0.1920.1040/1920.0.1440.900@1920.0.1440.900" timestamp="1722559733723" />
'1111'
2024-07-26 17:11:36 +08:00
</component>
123
2024-08-01 20:52:50 +08:00
>>>>>>> 5198921374dd01664dbc898956e7868edc9d8ecf
'1111'
2024-07-26 17:11:36 +08:00
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="javascript">
'123'
2024-08-01 17:23:46 +08:00
<url>file://$PROJECT_DIR$/ruoyi-ui/src/views/authorize/authorize/index.vue</url>
<line>455</line>
<option name="timeStamp" value="13" />
'1111'
2024-07-26 17:11:36 +08:00
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
'12222'
2024-06-24 16:57:12 +08:00
</component>
<component name="com.intellij.coverage.CoverageDataManagerImpl">
<SUITE FILE_PATH="coverage/ruoyi$SHA1.ic" NAME="SHA1 Coverage Results" MODIFIED="1718777464789" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
<FILTER>com.ruoyi.common.utils.sign.*</FILTER>
</SUITE>
<SUITE FILE_PATH="coverage/ruoyi$HttpUtils.ic" NAME="HttpUtils Coverage Results" MODIFIED="1718085138704" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
<FILTER>com.ruoyi.common.utils.http.*</FILTER>
</SUITE>
<SUITE FILE_PATH="coverage/ruoyi$DateUtils.ic" NAME="DateUtils Coverage Results" MODIFIED="1718787519284" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
<FILTER>com.ruoyi.common.utils.*</FILTER>
</SUITE>
</component>
</project>