xiaoning
/
gj_erp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1107文档需求

Browse Source
master
xiezuo003 2 years ago
parent d4656a08b1
commit 22f1f5d338
16 changed files with 222 additions and 403 deletions
Show Stats Download Patch File Download Diff File

427
.idea/workspace.xml
Unescape View File

@ -4,193 +4,23 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="a2c22d75-c3b6-48b6-93b4-6a3444d9a247" name="Default Changelist" comment="wanghaodong">
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Dhdto.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Pldto.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Tzjhdto.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Xbjhdto.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__antlr_antlr_2_7_7.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cglib_cglib_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__cglib_cglib_3_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cn_hutool_hutool_all_5_8_15.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__cn_hutool_hutool_all_5_8_15.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_easyexcel_2_2_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_easyexcel_2_2_7.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_83.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_83.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_corundumstudio_socketio_netty_socketio_1_7_23.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_corundumstudio_socketio_netty_socketio_1_7_23.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_11_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_11_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_11_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_11_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_11_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_11_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jeffreyning_mybatisplus_plus_1_5_1_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jeffreyning_mybatisplus_plus_1_5_1_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_3_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_annotations_2_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_annotations_2_0_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_20_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_20_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_infradna_tool_bridge_method_annotation_1_13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_infradna_tool_bridge_method_annotation_1_13.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_microsoft_sqlserver_mssql_jdbc_7_4_1_jre8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_microsoft_sqlserver_mssql_jdbc_7_4_1_jre8.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mysema_codegen_codegen_0_6_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mysema_codegen_codegen_0_6_8.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_mysema_commons_mysema_commons_lang_0_2_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_mysema_commons_mysema_commons_lang_0_2_4.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_apt_4_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_apt_4_3_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_codegen_4_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_codegen_4_3_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_core_4_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_core_4_3_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_jpa_4_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_querydsl_querydsl_jpa_4_3_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_istack_istack_commons_runtime_3_0_11.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_5.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_14.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_14.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_6_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_6_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_lettuce_lettuce_core_5_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_lettuce_lettuce_core_5_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_all_4_1_52_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_buffer_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_buffer_4_1_52_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_4_1_52_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_codec_http_4_1_52_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_common_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_common_4_1_52_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_handler_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_handler_4_1_52_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_resolver_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_resolver_4_1_52_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_4_1_52_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_native_epoll_4_1_52_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_52_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_netty_netty_transport_native_unix_common_4_1_52_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_10_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_projectreactor_reactor_core_3_3_10_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_validation_jakarta_validation_api_2_0_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_inject_javax_inject_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_inject_javax_inject_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_13.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_14.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_10_14.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_14.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_10_14.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_compress_1_18.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_compress_1_18.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_13_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_13_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_pdfbox_fontbox_2_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_pdfbox_fontbox_2_0_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_pdfbox_pdfbox_2_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_pdfbox_pdfbox_2_0_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_4_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_4_0_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_4_0_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_4_0_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_38.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_38.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_38.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_38.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_velocity_velocity_engine_core_2_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_3_0_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_16_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_16_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_dom4j_dom4j_2_1_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_dom4j_dom4j_2_1_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jdt_core_compiler_ecj_4_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_eclipse_jdt_core_compiler_ecj_4_3_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ehcache_ehcache_3_8_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ehcache_ehcache_3_8_1.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jakarta_el_3_0_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_2_3_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_glassfish_jaxb_txw2_2_3_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_2_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_1_0_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_5_4_21_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_core_5_4_21_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_1_5_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_1_5_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_24_0_GA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_24_0_GA.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_2_1_3_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_jandex_2_1_3_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_4_1_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_6_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_3_3_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_junit_jupiter_3_3_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_modelmapper_modelmapper_2_3_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_modelmapper_modelmapper_2_3_5.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_5_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_5_5.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_5.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_4_2.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_16_20.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_16_20.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_3.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_reflections_reflections_0_9_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_reflections_reflections_0_9_9.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_30.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_validation_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_3_4_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_3_4_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aspects_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aspects_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_orm_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_oxm_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_9_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_2_9_RELEASE.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_7_0.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_26.xml" afterDir="false" />
<list default="true" id="a2c22d75-c3b6-48b6-93b4-6a3444d9a247" name="Default Changelist" comment="1019文档需求3">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gj_erp.iml" beforeDir="false" afterPath="$PROJECT_DIR$/gj_erp.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Kwdto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Kwdto.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMxMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdMxMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/Test.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jcsj/EmGcrlController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jcsj/EmGcrlController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmJtsyjhController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmJtsyjhController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmZrcjhController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jhgk/DmZrcjhController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/EmGcrlService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/EmGcrlService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmJtsyjhService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmJtsyjhService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmZrcjhService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/DmZrcjhService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmJtsyjhServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmJtsyjhServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/sy/SYService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/sy/SYService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/mappers/jhgk/DmZrcjhMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mappers/jhgk/DmZrcjhMapper.xml" afterDir="false" />
</list>
<list id="1843e6b0-3c18-45b6-89c7-e9efbe3d4674" name="Revert &quot;finish&quot;" comment="Revert &quot;finish&quot;" />
<list id="4d943a56-b745-4db0-8fd5-bbd1f49b8f76" name="Revert &quot;finish&quot;-2" comment="Revert &quot;finish&quot;&#10;&#10;This reverts commit e413da9b" />
@ -213,77 +43,53 @@
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<option name="RESET_MODE" value="KEEP" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
<component name="ProjectId" id="2VTh8L8FuI3m4hrNyj7pp34alDh" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RequestMappingsPanelOrder0": "0",
"RequestMappingsPanelOrder1": "1",
"RequestMappingsPanelWidth0": "75",
"RequestMappingsPanelWidth1": "75",
"RunOnceActivity.ShowReadmeOnStart": "true",
"WebServerToolWindowFactoryState": "false",
"last_opened_file_path": "E:/runpeng/gjerp_ui",
"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",
"spring.configuration.checksum": "e66d70b2c05a7b57c5785db699821511",
"vue.rearranger.settings.migration": "true"
}
}]]></component>
<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="TODO_SCOPE" value="All Places" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="node.js.detected.package.eslint" value="true" />
<property name="node.js.detected.package.tslint" value="true" />
<property name="node.js.selected.package.eslint" value="(autodetect)" />
<property name="node.js.selected.package.tslint" value="(autodetect)" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="settings.editor.selected.configurable" value="application.passwordSafe" />
<property name="vue.rearranger.settings.migration" value="true" />
</component>
<component name="ReactorSettings">
<option name="notificationShown" value="true" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="E:\runpeng\gj_erp_new\src\main\resources\mappers\sy" />
<recent name="E:\runpeng\gj_erp_new\src\main\java\com\dsic\gj_erp\service\jhgk\impl" />
<recent name="E:\runpeng\gj_erp_new\src\main\java\com\dsic\gj_erp\service\jhgk" />
<recent name="E:\runpeng\gj_erp_new\src\main\resources\mappers\jhgk" />
<recent name="E:\runpeng\gj_erp_new\src\main\java\com\dsic\gj_erp\mapper\jhgk" />
</key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
<recent name="com.dsic.gj_erp.bean.jhgk" />
<recent name="E:\workSpace\gj_erp\src\main\java\com\dsic\gj_erp\dao\sy" />
<recent name="E:\workSpace\gj_erp\src\main\java\com\dsic\gj_erp\bean\request" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.dsic.gj_erp.bean.jcsj" />
<recent name="com.dsic.gj_erp.bean.jhgk" />
<recent name="com.dsic.gj_erp.bean.jhgk.dto" />
<recent name="com.dsic.gj_erp.service.jhgk" />
<recent name="com.dsic.gj_erp.service.jhgk.impl" />
<recent name="com.dsic.gj_erp.dao.jhgk" />
<recent name="com.dsic.gj_erp.dao.jcsj" />
<recent name="com.dsic.gj_erp.common" />
</key>
</component>
<component name="RunManager" selected="Spring Boot.GjErpApplication">
<configuration name="DmSygdController" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.dsic.gj_erp.controller.jhgk.DmSygdController" />
<module name="gj_erp" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.dsic.gj_erp.controller.jhgk.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="DmSygdMxController" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.dsic.gj_erp.controller.jhgk.DmSygdMxController" />
<configuration name="Test" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.dsic.gj_erp.Test" />
<module name="gj_erp" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.dsic.gj_erp.controller.jhgk.*" />
<option name="PATTERN" value="com.dsic.gj_erp.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
@ -291,41 +97,15 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="DmSygdMxServiceImpl" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.dsic.gj_erp.service.jhgk.impl.DmSygdMxServiceImpl" />
<module name="gj_erp" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.dsic.gj_erp.service.jhgk.impl.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="DmSygdServiceImpl" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.dsigj_erp.service.jhgk.impl.DmSygdServiceImpl" />
<module name="gj_erp" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.dsigj_erp.service.jhgk.impl.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="com.dsic.gj_erp.service.jhgk.impl.DmSygdServiceImpl" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.dsic.gj_erp.service.jhgk.impl.DmSygdServiceImpl" />
<module name="gj_erp" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.dsic.gj_erp.service.jhgk.impl.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
<option name="arquillianRunConfiguration">
<value>
<option name="containerStateName" value="" />
</value>
</option>
<option name="TEST_OBJECT" value="CLASS" />
<properties />
<listeners />
<method v="2">
<option name="Make" enabled="true" />
</method>
@ -339,11 +119,7 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="Application.DmSygdMxServiceImpl" />
<item itemvalue="Application.DmSygdMxController" />
<item itemvalue="Application.com.dsic.gj_erp.service.jhgk.impl.DmSygdServiceImpl" />
<item itemvalue="Application.DmSygdServiceImpl" />
<item itemvalue="Application.DmSygdController" />
<item itemvalue="Application.Test" />
</list>
</recent_temporary>
</component>
@ -380,45 +156,14 @@
<workItem from="1695351043840" duration="2412000" />
<workItem from="1695353513521" duration="2941000" />
<workItem from="1695383415111" duration="2165000" />
<workItem from="1695802200024" duration="1611000" />
<workItem from="1695870308694" duration="2922000" />
<workItem from="1696475736363" duration="677000" />
<workItem from="1696594298875" duration="6495000" />
<workItem from="1696639837317" duration="12226000" />
<workItem from="1696679003360" duration="1876000" />
<workItem from="1696734164061" duration="6012000" />
<workItem from="1696766214791" duration="851000" />
<workItem from="1696810883365" duration="19166000" />
<workItem from="1696854193468" duration="4998000" />
<workItem from="1696896554070" duration="5484000" />
<workItem from="1696986013167" duration="18352000" />
<workItem from="1697024673176" duration="3734000" />
<workItem from="1697073780884" duration="20100000" />
<workItem from="1697112185533" duration="1226000" />
<workItem from="1697163262383" duration="4402000" />
<workItem from="1697376356587" duration="1239000" />
<workItem from="1697433453323" duration="7767000" />
<workItem from="1697456575522" duration="10388000" />
<workItem from="1697471692173" duration="4346000" />
<workItem from="1697502148306" duration="16226000" />
<workItem from="1697536555329" duration="3265000" />
<workItem from="1697592676337" duration="7156000" />
<workItem from="1697622610359" duration="2293000" />
<workItem from="1697676714084" duration="7825000" />
<workItem from="1697763354094" duration="1275000" />
<workItem from="1697849837758" duration="15276000" />
<workItem from="1697939078969" duration="10821000" />
<workItem from="1698044328749" duration="4913000" />
<workItem from="1698065487262" duration="2034000" />
<workItem from="1698125387532" duration="5837000" />
<workItem from="1698141455147" duration="5238000" />
<workItem from="1698195906238" duration="22809000" />
<workItem from="1698227702797" duration="760000" />
<workItem from="1698285803515" duration="18061000" />
<workItem from="1698372237111" duration="3874000" />
<workItem from="1698544556403" duration="7524000" />
<workItem from="1698642002749" duration="12094000" />
<workItem from="1698715707323" duration="3411000" />
<workItem from="1697763475514" duration="1179000" />
<workItem from="1697800899358" duration="4279000" />
<workItem from="1697852420526" duration="5738000" />
<workItem from="1697871559613" duration="9557000" />
<workItem from="1697940710591" duration="5807000" />
<workItem from="1698025517542" duration="2101000" />
<workItem from="1698135831323" duration="3744000" />
<workItem from="1699405082467" duration="9551000" />
</task>
<task id="LOCAL-00001" summary="finish">
<created>1695345779307</created>
@ -490,28 +235,14 @@
<option name="project" value="LOCAL" />
<updated>1695353309158</updated>
</task>
<task id="LOCAL-00011" summary="wanghaodong">
<created>1697167182055</created>
<task id="LOCAL-00011" summary="1019文档需求">
<created>1697885046984</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1697167182055</updated>
<updated>1697885046984</updated>
</task>
<task id="LOCAL-00012" summary="排产">
<created>1697547818761</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1697547818761</updated>
</task>
<task id="LOCAL-00013" summary="gai">
<created>1697678917555</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1697678917555</updated>
</task>
<option name="localTasksCounter" value="14" />
<option name="localTasksCounter" value="12" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -527,25 +258,33 @@
</entry>
</map>
</option>
<option name="oldMeFiltersMigrated" value="true" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="finish" />
<MESSAGE value="Revert &quot;finish&quot;" />
<MESSAGE value="Revert &quot;finish&quot;&#10;&#10;This reverts commit e413da9b" />
<MESSAGE value="wanghaodong" />
<MESSAGE value="TEST" />
<MESSAGE value="Revert &quot;TEST&quot;1" />
<MESSAGE value="Revert &quot;finish&quot;&#10;&#10;test" />
<MESSAGE value="111&#10;&#10;This reverts commit f64a4dcb" />
<MESSAGE value="wanghaodong" />
<MESSAGE value="排产" />
<MESSAGE value="gai" />
<option name="LAST_COMMIT_MESSAGE" value="gai" />
<MESSAGE value="1019文档需求" />
<option name="LAST_COMMIT_MESSAGE" value="1019文档需求" />
</component>
<component name="XDebuggerManager">
<watches-manager>
<configuration name="SpringBootApplicationConfigurationType">
<watch expression="((HashMap)param_1).entrySet().toArray()[2]" custom="java.util.HashMap" />
</configuration>
</watches-manager>
<breakpoint-manager>
<breakpoints>
<breakpoint enabled="true" type="java-exception">
<properties class="java.lang.StackOverflowError" package="java.lang" />
<option name="timeStamp" value="6" />
</breakpoint>
</breakpoints>
</breakpoint-manager>
<pin-to-top-manager>
<pinned-members>
<PinnedItemInfo parentTag="java.util.HashMap$Node" memberName="value" />
</pinned-members>
</pin-to-top-manager>
</component>
</project>

10
src/main/java/com/dsic/gj_erp/Test.java
Unescape View File

@ -2,15 +2,15 @@ package com.dsic.gj_erp;
import org.springframework.boot.SpringApplication;
import java.time.LocalDate;
import java.time.Period;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class Test {
public static void main(String[] args) {
Pattern p = Pattern.compile(".*\\.xls");
// 创建 Matcher 对象
Matcher m = p.matcher("s集团xls滚动计划——线表 - 副本.xls");
System.out.println(m.matches());
String aaa="gagagag";
System.out.println(aaa.split("@")[0]);
}
}

2
src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java
Unescape View File

@ -38,7 +38,7 @@ public class EmSbrydyp implements Serializable {
private String sbmc;
@Id
@TableId(value = "RYMC", type = IdType.ASSIGN_UUID)
@TableId(value = "RYMC")//, type = IdType.ASSIGN_UUID)
@ApiModelProperty(value = "人员名称")
private String rymc;

20
src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java
Unescape View File

@ -69,19 +69,15 @@ public class DmZrcjh implements Serializable {
@ApiModelProperty(value = "线表重量")
private Double xbzl;
@ExcelIgnore
@ApiModelProperty(value = "批量表（钢加大组结束）")
private String gjjsDzPl;
@ExcelIgnore
@ApiModelProperty(value = "时间差（L-P）")
private String sjcLp;
@ExcelIgnore
@ApiModelProperty(value = "钢加小组结束")
private String gjjsXz;
@ExcelIgnore
@ApiModelProperty(value = "批量表（钢加小组结束）")
private String gjjsXzPl;
@ -92,51 +88,39 @@ public class DmZrcjh implements Serializable {
@ApiModelProperty(value = "钢加开始")
private String gjks;
@ExcelIgnore
@ApiModelProperty(value = "批量表（钢加开始）")
private String gjksPl;
@ExcelIgnore
@ApiModelProperty(value = "时间差（U-V）")
private String sjcUv;
@ExcelIgnore
@ApiModelProperty(value = "套料图下发")
private String xfqTlt;
@ExcelIgnore
@ApiModelProperty(value = "套料图接收")
private String jsqTlt;
@ExcelIgnore
@ApiModelProperty(value = "板材领取表下发")
private String xfqLqb;
@ExcelIgnore
@ApiModelProperty(value = "板材领取表接收")
private String jsqLqb;
@ExcelIgnore
@ApiModelProperty(value = "零件配套表下发")
private String xfqPtb;
@ExcelIgnore
@ApiModelProperty(value = "零件配套表接收")
private String jsqPtb;
@ExcelIgnore
@ApiModelProperty(value = "订货清单号")
private String dhqd;
@ExcelIgnore
@ApiModelProperty(value = "订货清单下发")
private String xfqDhqd;
@ExcelIgnore
@ApiModelProperty(value = "实际订货日期")
private String sjdhq;
@ExcelIgnore
@ApiModelProperty(value = "板材计划到齐")
private String bcdq;
@ -148,5 +132,9 @@ public class DmZrcjh implements Serializable {
// @ExcelField(value = "序号")
private String xh;
@ApiModelProperty(value = "编制人")
private String bzr;
@ApiModelProperty(value = "编制日期 yyyy/MM/dd")
private String bzrq;
}

9
src/main/java/com/dsic/gj_erp/controller/jcsj/EmGcrlController.java
Unescape View File

@ -10,10 +10,7 @@ import com.dsic.gj_erp.service.jcsj.EmSbcnpService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@ -50,8 +47,8 @@ public class EmGcrlController {
@ApiOperation(value = "生成工厂日历")
@PostMapping(value = "/generate")
public ResultBean generate() {
emGcrlService.generate();
public ResultBean generate(@RequestParam String nf) {
emGcrlService.generate(nf);
return new ResultBean();
}

7
src/main/java/com/dsic/gj_erp/controller/jhgk/DmJtsyjhController.java
Unescape View File

@ -2,6 +2,7 @@ package com.dsic.gj_erp.controller.jhgk;
import com.alibaba.fastjson.JSONObject;
import com.dsic.gj_erp.annotation.AuthFunction;
import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jhgk.DmJtsyjh;
import com.dsic.gj_erp.bean.jhgk.DmXbjh;
@ -12,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
@ -46,8 +48,9 @@ public class DmJtsyjhController {
@ApiOperation(value = "批量保存")
@PostMapping(value = "/save")
public ResultBean save(@RequestBody List<DmJtsyjh> dmJtsyjhs) {
dmJtsyjhService.save(dmJtsyjhs);
@AuthFunction()
public ResultBean save(@RequestBody List<DmJtsyjh> dmJtsyjhs,HttpServletRequest request) {
dmJtsyjhService.save(request,dmJtsyjhs);
return new ResultBean();
}

7
src/main/java/com/dsic/gj_erp/controller/jhgk/DmZrcjhController.java
Unescape View File

@ -2,6 +2,7 @@ package com.dsic.gj_erp.controller.jhgk;
import com.alibaba.fastjson.JSONObject;
import com.dsic.gj_erp.annotation.AuthFunction;
import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jhgk.DmTzjh;
import com.dsic.gj_erp.bean.jhgk.DmXbjh;
@ -14,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
@ -48,8 +50,9 @@ public class DmZrcjhController {
@ApiOperation(value = "批量保存")
@PostMapping(value = "/save")
public ResultBean save(@RequestBody List<DmZrcjh> dmZrcjhs) {
dmZrcjhService.save(dmZrcjhs);
@AuthFunction()
public ResultBean save(@RequestBody List<DmZrcjh> dmZrcjhs, HttpServletRequest req) {
dmZrcjhService.save(req,dmZrcjhs);
return new ResultBean();
}

2
src/main/java/com/dsic/gj_erp/service/jcsj/EmGcrlService.java
Unescape View File

@ -21,6 +21,6 @@ public interface EmGcrlService extends IService<EmGcrl> {
void update(List<EmGcrl> emGcrls);
void generate();
void generate(String nf);
}

51
src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java
Unescape View File

@ -10,16 +10,20 @@ import com.dsic.gj_erp.bean.jcsj.EmSbcnp;
import com.dsic.gj_erp.dao.jcsj.EmGcrlRepository;
import com.dsic.gj_erp.mapper.jcsj.EmGcrlMapper;
import com.dsic.gj_erp.service.jcsj.EmGcrlService;
import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Repository;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.time.DayOfWeek;
import java.time.LocalDate;
import java.time.Period;
import java.time.Year;
import java.util.Date;
import java.util.List;
import java.time.format.DateTimeFormatter;
import java.time.temporal.WeekFields;
import java.util.*;
/**
* <p>
@ -38,11 +42,15 @@ public class EmGcrlServiceImpl extends ServiceImpl<EmGcrlMapper, EmGcrl> impleme
EmGcrlRepository emGcrlRepository;
String[] weekArray = { "一", "二", "三", "四", "五", "六","日"};
@Override
public List<EmGcrl> getList(JSONObject json) {
QueryWrapper<EmGcrl> queryWrapper=new QueryWrapper<>();
if(StringUtils.isNotEmpty(json.getString("nf"))){
queryWrapper.eq("NF",json.getString("nf"));
}else{
queryWrapper.eq("NF", Calendar.getInstance().get(Calendar.YEAR));
}
queryWrapper.orderByDesc("gl");
List<EmGcrl> emGcrls=emGcrlMapper.selectList(queryWrapper);
@ -58,19 +66,36 @@ public class EmGcrlServiceImpl extends ServiceImpl<EmGcrlMapper, EmGcrl> impleme
}
@Override
public void generate() {
String nf=Year.now().toString();
public void generate(String nf) {
List<EmGcrl> emGcrlRepositoryByNf=emGcrlRepository.findByNf(nf);
if (ObjectUtil.isEmpty(emGcrlRepositoryByNf)){
EmGcrl emGcrl=new EmGcrl();
Date date = new Date();//获取当前时间
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd");//定义日期格式
String dateString = dateFormat.format(date);
emGcrl.setNf(nf);
emGcrl.setGl(dateString);
// emGcrl.setXh("1");
emGcrlMapper.insert(emGcrl);
// this.save(emGcrl);
Integer intNF=Integer.parseInt(nf);
LocalDate startDate = LocalDate.of(intNF, 1, 1); // 起始日期：2022年1月1日
LocalDate endDate = LocalDate.of(intNF, 12, 31); // 结束日期：2022年12月31日
List<EmGcrl> saveList=new ArrayList<>();
LocalDate currentDate = startDate;
while (currentDate.isBefore(endDate) || currentDate.isEqual(endDate)) {
EmGcrl emGcrl=new EmGcrl();
emGcrl.setNf(nf);
String gl = currentDate.format(DateTimeFormatter.ofPattern("yyyy/MM/dd"));
emGcrl.setGl(gl);
WeekFields weekFields = WeekFields.of(Locale.getDefault());
Integer weekOfYear = currentDate.get(weekFields.weekOfYear());
emGcrl.setNz(weekOfYear.toString());
Integer weekOfMonth = currentDate.get(weekFields.weekOfMonth());
emGcrl.setYz(weekOfMonth.toString());
DayOfWeek dayOfWeek = currentDate.getDayOfWeek();
Integer zj=dayOfWeek.getValue();
emGcrl.setXq(weekArray[zj-1]);
if(zj==6||zj==7){
emGcrl.setXxr("0");
}else {
emGcrl.setXh("1");
}
saveList.add(emGcrl);
currentDate = currentDate.plusDays(1); // 增加一天，处理下一个日期
}
saveBatch(saveList);
}
}
}

3
src/main/java/com/dsic/gj_erp/service/jhgk/DmJtsyjhService.java
Unescape View File

@ -6,6 +6,7 @@ import com.dsic.gj_erp.bean.jhgk.DmJtsyjh;
import com.dsic.gj_erp.bean.jhgk.DmXbjh;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
@ -23,7 +24,7 @@ public interface DmJtsyjhService extends IService<DmJtsyjh> {
List<DmJtsyjh> upload(MultipartFile file) throws IOException;
void save(List<DmJtsyjh> dmJtsyjhs);
void save(HttpServletRequest request, List<DmJtsyjh> dmJtsyjhs);
void tj(List<DmJtsyjh> dmJtsyjhs);
}

3
src/main/java/com/dsic/gj_erp/service/jhgk/DmZrcjhService.java
Unescape View File

@ -6,6 +6,7 @@ import com.dsic.gj_erp.bean.jhgk.DmXbjh;
import com.dsic.gj_erp.bean.jhgk.DmZrcjh;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.List;
@ -22,7 +23,7 @@ public interface DmZrcjhService extends IService<DmZrcjh> {
List<DmZrcjh> upload(MultipartFile file) throws IOException;
void save(List<DmZrcjh> dmZrcjhs);
void save(HttpServletRequest req, List<DmZrcjh> dmZrcjhs);
void tj(List<DmZrcjh> dmZrcjhs);

18
src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmJtsyjhServiceImpl.java
Unescape View File

@ -13,12 +13,16 @@ import com.dsic.gj_erp.util.ExcelUtil;
import com.google.common.collect.Lists;
import org.apache.commons.lang3.StringUtils;
import org.modelmapper.ModelMapper;
import org.springframework.http.HttpRequest;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -48,8 +52,7 @@ public class DmJtsyjhServiceImpl extends ServiceImpl<DmJtsyjhMapper, DmJtsyjh> i
String time=json.getString("jhrq");
String startTime=time.split("~")[0];
String endTime=time.split("~")[1];
queryWrapper.gt("jhrq",startTime);
queryWrapper.lt("jhrq",endTime);
queryWrapper.between("jhrq",startTime,endTime);
}
if(StringUtils.isNotEmpty(json.getString("Zt"))){
queryWrapper.eq("zt",json.getString("Zt"));
@ -74,7 +77,16 @@ public class DmJtsyjhServiceImpl extends ServiceImpl<DmJtsyjhMapper, DmJtsyjh> i
}
@Override
public void save(List<DmJtsyjh> dmJtsyjhs) {
public void save(HttpServletRequest request, List<DmJtsyjh> dmJtsyjhs) {
String yhdm = (String) request.getAttribute("yhdm");
Date date=new Date();
SimpleDateFormat sdf= new SimpleDateFormat("yyyy/MM/dd");
String day=sdf.format(date);
dmJtsyjhs.forEach(dmJtsyjh -> {
dmJtsyjh.setBzrq(day);
dmJtsyjh.setBzy(yhdm);
});
saveBatch(dmJtsyjhs);
List<List<DmJtsyjh>> lists = Lists.partition(dmJtsyjhs, 300);
for (List<DmJtsyjh> list:lists) {

3
src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmXbjhServiceImpl.java
Unescape View File

@ -49,8 +49,7 @@ public class DmXbjhServiceImpl extends ServiceImpl<DmXbjhMapper, DmXbjh> impleme
String nf=json.getString("nf");
String startTime=nf.split("~")[0];
String endTime=nf.split("~")[1];
queryWrapper.gt("nf",startTime);
queryWrapper.lt("nf",endTime);
queryWrapper.between("nf",startTime,endTime);
}
List<DmXbjh> dmTzjhs=dmXbjhMapper.selectList(queryWrapper);
Map<String,List<DmXbjh>> map=dmTzjhs.stream().collect(Collectors.groupingBy(DmXbjh::getDcCh));

59
src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java
Unescape View File

@ -1,6 +1,7 @@
package com.dsic.gj_erp.service.jhgk.impl;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.poi.excel.ExcelReader;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -18,8 +19,11 @@ import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -48,8 +52,7 @@ public class DmZrcjhServiceImpl extends ServiceImpl<DmZrcjhMapper, DmZrcjh> impl
String time=json.getString("gjks");
String startTime=time.split("~")[0];
String endTime=time.split("~")[1];
queryWrapper.gt("gjks",startTime);
queryWrapper.lt("gjks",endTime);
queryWrapper.between("gjks",startTime,endTime);
}
if(StringUtils.isNotEmpty(json.getString("Zt"))){
queryWrapper.eq("zt",json.getString("Zt"));
@ -70,10 +73,56 @@ public class DmZrcjhServiceImpl extends ServiceImpl<DmZrcjhMapper, DmZrcjh> impl
}
@Override
public void save(List<DmZrcjh> dmZrcjhs) {
saveBatch(dmZrcjhs);
public void save(HttpServletRequest req,List<DmZrcjh> dmZrcjhs) {
String bzr= (String) req.getAttribute("yhms");
Date date=new Date();
List<List<DmZrcjh>> lists = Lists.partition(dmZrcjhs, 300);
List<DmZrcjh> saveDmzrcjhList=new ArrayList<>();
SimpleDateFormat sdf= new SimpleDateFormat("yyyy/MM/dd");
String day=sdf.format(date);
dmZrcjhs.forEach(dmZrcjh -> {
QueryWrapper<DmZrcjh> queryWrapper=new QueryWrapper<>();
queryWrapper.eq("DC_CH",dmZrcjh.getDcCh());
queryWrapper.eq("DC_PL",dmZrcjh.getDcPl());
queryWrapper.eq("DC_FD",dmZrcjh.getDcFd());
DmZrcjh dmZrcjhOne=dmZrcjhMapper.selectOne(queryWrapper);
if (ObjectUtil.isNotEmpty(dmZrcjhOne)){
String dmZrcjhOneBzr=dmZrcjhOne.getBzr();
String dmZrcjhOneBzrq=dmZrcjhOne.getBzrq();
if (dmZrcjhOneBzr.contains(bzr)){
String[] bzrStr=dmZrcjhOneBzr.split("@");
String[] bzrqStr=dmZrcjhOneBzrq.split("@");
boolean append=false;
for (int i=0;i<bzrqStr.length;i++){
if (bzrStr[i].equals(bzr)&&bzrqStr[i].equals(day)){
append=true;
break;
}
}
if (!append){
String appendBzr=(dmZrcjhOneBzr+"@"+bzr);
String appendBzrq=(dmZrcjhOneBzrq+"@"+day);
dmZrcjh.setBzr(appendBzr);
dmZrcjh.setBzrq(appendBzrq);
updateById(dmZrcjh);
}
}
else {
dmZrcjh.setBzr(dmZrcjhOneBzr+"@"+bzr);
dmZrcjh.setBzrq(dmZrcjhOneBzrq+"@"+day);
updateById(dmZrcjh);
}
}
else {
dmZrcjh.setBzr(bzr);
dmZrcjh.setBzrq(day);
saveDmzrcjhList.add(dmZrcjh);
}
});
saveBatch(saveDmzrcjhList);
List<List<DmZrcjh>> lists = Lists.partition(saveDmzrcjhList, 300);
for (List<DmZrcjh> list:lists) {
dmZrcjhMapper.updateCzplpNEW(list);
}

2
src/main/java/com/dsic/gj_erp/service/sy/SYService.java
Unescape View File

@ -418,7 +418,7 @@ public class SYService {
if (bmlb.equals("bmbm")){
dmZhbmp=dm_zhbmpRepository.findbmbm();
}
else if(bmlb.equals("qgkw")){
else if(bmlb.equals("QGKW")){
dmZhbmp=dm_zhbmpRepository.findqgkw();
}
else {

2
src/main/resources/mappers/jhgk/DmZrcjhMapper.xml
Unescape View File

@ -37,6 +37,8 @@
<result column="sjdhq" property="sjdhq" />
<result column="bcdq" property="bcdq" />
<result column="zt" property="zt" />
<result column="bzr" property="bzr" />
<result column="bzrq" property="bzrq" />
</resultMap>
<update id="updateCzplpNEW" parameterType="list">

Write Preview
Loading…
Cancel
Save