tijiao

.idea/compiler.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />

.idea/workspace.xml

@@ -20,255 +20,34 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="abe40335-1998-468a-9c83-8ed884d8e030" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_2.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsBidAreaMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/model/RmsBidArea.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsBidAreaService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsBidAreaServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsBidAreaMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsBidAreaMapper.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsBidAreaMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsBidArea.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsBidAreaService.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsBidAreaServiceImpl.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/test-classes/com/steerinfo/dil/rmsbidarea/controller/RmsBidAreaController.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/test-classes/com/steerinfo/dil/rmsbidarea/mapper/RmsBidAreaMapper.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/test-classes/com/steerinfo/dil/rmsbidarea/model/RmsBidArea.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/test-classes/com/steerinfo/dil/rmsbidarea/service/IRmsBidAreaService.class" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/target/test-classes/com/steerinfo/dil/rmsbidarea/service/impl/RmsBidAreaServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.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__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__aopalliance_aopalliance_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cglib_cglib_3_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__cglib_cglib_3_2_5.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__com_alibaba_druid_1_1_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_10.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_beust_jcommander_1_48.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_beust_jcommander_1_48.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_ctrip_framework_apollo_apollo_client_1_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_ctrip_framework_apollo_apollo_client_1_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_ctrip_framework_apollo_apollo_core_1_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_ctrip_framework_apollo_apollo_core_1_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_9_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_afterburner_2_9_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_andrewoma_dexx_dexx_collections_0_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_andrewoma_dexx_dexx_collections_0_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jai_imageio_jai_imageio_core_1_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jai_imageio_jai_imageio_core_1_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_5.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_github_vlsi_compactmap_compactmap_1_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_vlsi_compactmap_compactmap_1_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_annotations_3_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_annotations_3_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_5.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_google_inject_guice_4_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_inject_guice_4_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_zxing_core_3_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_zxing_core_3_3_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_zxing_javase_3_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_zxing_javase_3_3_0.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_netflix_archaius_archaius_core_0_7_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_archaius_archaius_core_0_7_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_9_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_eureka_eureka_client_1_9_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_9_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_eureka_eureka_core_1_9_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_hystrix_hystrix_core_1_5_12.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_hystrix_hystrix_javanica_1_5_12.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_hystrix_hystrix_metrics_event_stream_1_5_12.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_hystrix_hystrix_serialization_1_5_12.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_commons_util_0_3_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_eventbus_0_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_eventbus_0_3_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_infix_0_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_infix_0_3_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_netflix_commons_netflix_statistics_0_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_2_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_core_2_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_eureka_2_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_httpclient_2_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_loadbalancer_2_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_2_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_ribbon_ribbon_transport_2_2_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_netflix_servo_servo_core_0_12_21.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_oracle_ojdbc6_11_2_0_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_oracle_ojdbc6_11_2_0_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_8_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_8_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okio_okio_1_13_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okio_okio_1_13_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_steerinfo_framework_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_steerinfo_framework_1_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_apache_client4_1_19_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_19_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_thoughtworks_xstream_xstream_1_4_10.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_2_7_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_configuration_commons_configuration_1_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_jxpath_commons_jxpath_1_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_jxpath_commons_jxpath_1_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_core_9_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_core_9_7_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_httpclient_9_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_httpclient_9_7_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_hystrix_9_7_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_java8_9_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_java8_9_7_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_feign_slf4j_9_7_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_form_feign_form_3_3_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_3_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_github_openfeign_form_feign_form_spring_3_3_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_7_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_jsonwebtoken_jjwt_0_7_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_micrometer_micrometer_core_1_0_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_micrometer_micrometer_core_1_0_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxjava_1_3_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxjava_reactive_streams_1_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxnetty_0_4_9.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxnetty_contexts_0_4_9.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__io_reactivex_rxnetty_servo_0_4_9.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__javax_annotation_javax_annotation_api_1_3_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.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__javax_validation_validation_api_2_0_1_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__joda_time_joda_time_2_9_9.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__joda_time_joda_time_2_9_9.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__log4j_log4j_1_2_17.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__log4j_log4j_1_2_17.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__net_jcip_jcip_annotations_1_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_jcip_jcip_annotations_1_0.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__net_sf_ehcache_ehcache_core_2_6_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_8.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_ant_ant_1_9_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_ant_ant_1_9_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_9_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_9_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_6.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_6.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_10.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_10_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_10_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_17.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_17.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_4_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_4_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_35.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_35.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_35.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_35.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_35.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_35.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_60.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_60.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_60.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_60.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_7.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_7.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_4.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_4_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_10.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_10.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_13_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_13_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_24_1_GA.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_24_1_GA.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.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_2_15_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_caches_mybatis_ehcache_1_0_3.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_caches_mybatis_ehcache_1_0_3.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_4_5.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_4_5.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_1.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_ow2_asm_asm_6_0_ALPHA.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_16_22.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_projectlombok_lombok_1_16_22.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.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_jcl_over_slf4j_1_7_25.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_25.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_25.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_cache_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_cache_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j_1_3_8_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j_1_3_8_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_websocket_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_commons_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_client_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_client_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_context_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_archaius_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_core_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_eureka_client_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_netflix_ribbon_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_openfeign_core_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_config_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_config_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_archaius_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_client_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_eureka_client_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_hystrix_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_netflix_ribbon_2_0_2_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_0_2_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_openfeign_2_0_2_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_security_spring_security_crypto_5_0_10_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_crypto_5_0_10_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_7_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_security_spring_security_rsa_1_0_7_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_messaging_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_messaging_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_websocket_5_0_11_RELEASE.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_websocket_5_0_11_RELEASE.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__stax_stax_api_1_0_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__xmlpull_xmlpull_1_1_3_1.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__xpp3_xpp3_min_1_1_4c.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dil-api.iml" beforeDir="false" afterPath="$PROJECT_DIR$/dil-api.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsPierController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsPierController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsPortController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsPortController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsPortStorageYard.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsPortStorageYard.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/feign/ESFeign.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/feign/ESFeign.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsPortStorageYardService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsPortStorageYardService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsWarehouseMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCarrierController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCarrierController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsOilPriceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsOilPriceController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsCarrierService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsCarrierService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/bootstrap.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsPierController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsPierController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsPortController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsPortController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsPortStorageYard.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsPortStorageYard.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/feign/ESFeign.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/feign/ESFeign.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsPortStorageYardService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsPortStorageYardService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCarrierController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCarrierController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsOilPriceController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsOilPriceController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsCarrierService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsCarrierService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.class" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -281,9 +60,9 @@
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
-        <option name="localRepository" value="F:\cangkua" />
-        <option name="mavenHome" value="$PROJECT_DIR$/../../../maven 3.6/maven 3.6" />
-        <option name="userSettingsFile" value="F:\maven 3.6\maven 3.6\conf\settings.xml" />
+        <option name="localRepository" value="C:\Maven\cangku" />
+        <option name="mavenHome" value="$PROJECT_DIR$/../../../../Maven/apache-maven-3.5.0" />
+        <option name="userSettingsFile" value="C:\Maven\apache-maven-3.5.0\conf\settings.xml" />
       </MavenGeneralSettings>
     </option>
   </component>
@@ -299,10 +78,10 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../DAL-DAZHOU-API" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -317,7 +96,11 @@
       <recent name="com.steerinfo.dil.model" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="C:\Users\mdzzojbk\IdeaProjects\DAL-DAZHOU-RMS-API\src\main\resources\com\steerinfo\dil\mapper" />
+      <recent name="C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl" />
+      <recent name="C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service" />
+      <recent name="C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\resources\com\steerinfo\dil\mapper" />
+      <recent name="C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model" />
+      <recent name="C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper" />
     </key>
   </component>
   <component name="RunManager">
@@ -340,7 +123,9 @@
       <option name="presentableId" value="Default" />
       <updated>1639799862423</updated>
       <workItem from="1639799866763" duration="17817000" />
-      <workItem from="1639964348584" duration="15743000" />
+      <workItem from="1639963691127" duration="15865000" />
+      <workItem from="1639799866763" duration="19781000" />
+      <workItem from="1639960339544" duration="3726000" />
     </task>
     <servers />
   </component>
@@ -357,68 +142,87 @@
         </entry>
       </map>
     </option>
+    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="WindowStateProjectService">
+    <state x="446" y="46" key="#com.intellij.ide.util.MemberChooser" timestamp="1639985896075">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="446" y="46" key="#com.intellij.ide.util.MemberChooser/0.0.1280.680@0.0.1280.680" timestamp="1639985896075" />
     <state width="444" height="466" key="DebuggerActiveHint" timestamp="1639818003519">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="444" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1639818003519" />
-    <state x="549" y="166" key="FileChooserDialogImpl" timestamp="1639964436700">
+    <state x="549" y="166" key="FileChooserDialogImpl" timestamp="1639961493966">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state x="549" y="166" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1639964436700" />
-    <state width="1487" height="210" key="GridCell.Tab.0.bottom" timestamp="1639996527856">
+    <state x="458" y="137" key="FileChooserDialogImpl/0.0.1280.680@0.0.1280.680" timestamp="1639965013078" />
+    <state x="549" y="166" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1639961493966" />
+    <state width="1487" height="209" key="GridCell.Tab.0.bottom" timestamp="1639997169138">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1487" height="210" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639996527856" />
-    <state width="1487" height="210" key="GridCell.Tab.0.center" timestamp="1639996527856">
+    <state width="1237" height="305" key="GridCell.Tab.0.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639989735386" />
+    <state width="1487" height="209" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639997169138" />
+    <state width="1487" height="209" key="GridCell.Tab.0.center" timestamp="1639997169138">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1487" height="210" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1639996527856" />
-    <state width="1487" height="210" key="GridCell.Tab.0.left" timestamp="1639996527856">
+    <state width="1237" height="305" key="GridCell.Tab.0.center/0.0.1280.680@0.0.1280.680" timestamp="1639989735386" />
+    <state width="1487" height="209" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1639997169138" />
+    <state width="1487" height="209" key="GridCell.Tab.0.left" timestamp="1639997169138">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1487" height="210" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1639996527856" />
-    <state width="1487" height="210" key="GridCell.Tab.0.right" timestamp="1639996527856">
+    <state width="1237" height="305" key="GridCell.Tab.0.left/0.0.1280.680@0.0.1280.680" timestamp="1639989735385" />
+    <state width="1487" height="209" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1639997169138" />
+    <state width="1487" height="209" key="GridCell.Tab.0.right" timestamp="1639997169138">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1487" height="210" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1639996527856" />
-    <state width="1487" height="210" key="GridCell.Tab.1.bottom" timestamp="1639996527734">
-      <screen x="0" y="0" width="1536" height="824" />
+    <state width="1237" height="305" key="GridCell.Tab.0.right/0.0.1280.680@0.0.1280.680" timestamp="1639989735386" />
+    <state width="1487" height="209" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1639997169138" />
+    <state width="1237" height="305" key="GridCell.Tab.1.bottom" timestamp="1639989735900">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1487" height="210" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639996527734" />
-    <state width="1487" height="210" key="GridCell.Tab.1.center" timestamp="1639996527733">
-      <screen x="0" y="0" width="1536" height="824" />
+    <state width="1237" height="305" key="GridCell.Tab.1.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639989735900" />
+    <state width="1493" height="462" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639822112421" />
+    <state width="1237" height="305" key="GridCell.Tab.1.center" timestamp="1639989735900">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1487" height="210" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1639996527733" />
-    <state width="1487" height="210" key="GridCell.Tab.1.left" timestamp="1639996527733">
-      <screen x="0" y="0" width="1536" height="824" />
+    <state width="1237" height="305" key="GridCell.Tab.1.center/0.0.1280.680@0.0.1280.680" timestamp="1639989735900" />
+    <state width="1493" height="462" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1639822112420" />
+    <state width="1237" height="305" key="GridCell.Tab.1.left" timestamp="1639989735900">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1487" height="210" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1639996527733" />
-    <state width="1487" height="210" key="GridCell.Tab.1.right" timestamp="1639996527734">
-      <screen x="0" y="0" width="1536" height="824" />
+    <state width="1237" height="305" key="GridCell.Tab.1.left/0.0.1280.680@0.0.1280.680" timestamp="1639989735900" />
+    <state width="1493" height="462" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1639822112420" />
+    <state width="1237" height="305" key="GridCell.Tab.1.right" timestamp="1639989735900">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1487" height="210" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1639996527734" />
-    <state width="1487" height="210" key="GridCell.Tab.2.bottom" timestamp="1639996527735">
-      <screen x="0" y="0" width="1536" height="824" />
+    <state width="1237" height="305" key="GridCell.Tab.1.right/0.0.1280.680@0.0.1280.680" timestamp="1639989735900" />
+    <state width="1493" height="462" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1639822112420" />
+    <state width="1237" height="242" key="GridCell.Tab.2.bottom" timestamp="1639989772908">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1487" height="210" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639996527735" />
-    <state width="1487" height="210" key="GridCell.Tab.2.center" timestamp="1639996527735">
-      <screen x="0" y="0" width="1536" height="824" />
+    <state width="1237" height="242" key="GridCell.Tab.2.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639989772908" />
+    <state width="1493" height="462" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639822112421" />
+    <state width="1237" height="242" key="GridCell.Tab.2.center" timestamp="1639989772908">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1487" height="210" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1639996527735" />
-    <state width="1487" height="210" key="GridCell.Tab.2.left" timestamp="1639996527734">
-      <screen x="0" y="0" width="1536" height="824" />
+    <state width="1237" height="242" key="GridCell.Tab.2.center/0.0.1280.680@0.0.1280.680" timestamp="1639989772908" />
+    <state width="1493" height="462" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1639822112421" />
+    <state width="1237" height="242" key="GridCell.Tab.2.left" timestamp="1639989772908">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1487" height="210" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1639996527734" />
-    <state width="1487" height="210" key="GridCell.Tab.2.right" timestamp="1639996527735">
-      <screen x="0" y="0" width="1536" height="824" />
+    <state width="1237" height="242" key="GridCell.Tab.2.left/0.0.1280.680@0.0.1280.680" timestamp="1639989772908" />
+    <state width="1493" height="462" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1639822112421" />
+    <state width="1237" height="242" key="GridCell.Tab.2.right" timestamp="1639989772908">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1487" height="210" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1639996527735" />
-    <state x="270" y="0" key="SettingsEditor" timestamp="1639964438433">
-      <screen x="0" y="0" width="1536" height="824" />
+    <state width="1237" height="242" key="GridCell.Tab.2.right/0.0.1280.680@0.0.1280.680" timestamp="1639989772908" />
+    <state width="1493" height="462" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1639822112421" />
+    <state x="225" y="0" key="SettingsEditor" timestamp="1639963719060">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state x="270" y="0" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1639964438433" />
+    <state x="225" y="0" key="SettingsEditor/0.0.1280.680@0.0.1280.680" timestamp="1639963719060" />
+    <state x="270" y="56" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1639799919381" />
     <state x="235" y="0" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1639818889347">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
@@ -428,4 +232,15 @@
     </state>
     <state x="425" y="187" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1639814402364" />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCarrierController.java</url>
+          <line>112</line>
+          <option name="timeStamp" value="12" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
 </project>

dil-api.iml

@@ -7,6 +7,10 @@
     <facet type="web" name="Web">
       <configuration>
         <webroots />
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+        </sourceRoots>
       </configuration>
     </facet>
   </component>
@@ -16,6 +20,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />

pom.xml

@@ -111,7 +111,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>RMS_GATEPOST_RULES</param>
+                        <param>RMS_BID_AREA</param>
                     </tables>
                 </configuration>
                 <executions>

src/main/java/com/steerinfo/dil/controller/RmsCarrierController.java

@@ -2,7 +2,9 @@ package com.steerinfo.dil.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.steerinfo.dil.feign.ESFeign;
+import com.steerinfo.dil.model.RmsBidArea;
 import com.steerinfo.dil.model.RmsCarrier;
+import com.steerinfo.dil.service.impl.RmsBidAreaServiceImpl;
 import com.steerinfo.dil.service.impl.RmsCarrierServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
@@ -39,6 +41,8 @@ public class RmsCarrierController extends BaseRESTfulController {
 
     @Autowired
     RmsCarrierServiceImpl rmsCarrierService;
+    @Autowired
+    RmsBidAreaServiceImpl rmsBidAreaService;
 
     @Autowired
     ColumnDataUtil columnDataUtil;
@@ -66,6 +70,9 @@ public class RmsCarrierController extends BaseRESTfulController {
                                         Integer pageNum,
                                         Integer pageSize,
                                         String con){
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
 
         //框计算
         if (con != null) {
@@ -98,12 +105,37 @@ public class RmsCarrierController extends BaseRESTfulController {
             listTotal = rmsCarrierService.getCarrierList(mapValue);
         }
 
+//        System.out.println(listTotal);
+
         System.out.println(listTotal);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = rmsCarrierService.getCarrierList(mapValue);
+        //        将中标区域id转换为先对应的地方
+        for (Map<String, Object> map: columnList){
+            BigDecimal carrierBidAreaId=(BigDecimal) map.get("carrierBidAreaId");
+            if (carrierBidAreaId!=null){
+                //            根据id获取中标区域然后进行拼接
+                Map<String, Object> map1=rmsBidAreaService.getBidAreaById(carrierBidAreaId);
+                String carrierBidArea="";
+                if (map1.get("bidAreaProvince")!=null){
+                    carrierBidArea=carrierBidArea+(String)map1.get("bidAreaProvince");
+                }
+                if (map1.get("bidAreaCity")!=null){
+                    carrierBidArea=carrierBidArea+(String)map1.get("bidAreaCity");
+                }
+                if (map1.get("bidAreaCount")!=null){
+                    carrierBidArea=carrierBidArea+(String)map1.get("bidAreaCount");
+                }
+                if (map1.get("bidAreaCountry")!=null){
+                    carrierBidArea=carrierBidArea+(String)map1.get("bidAreaCountry");
+                }
+                map.put("carrierBidArea",carrierBidArea);
+            }
+        }
 
         PageListAdd data = columnDataUtil.tableColumnData(apiId,listTotal,columnList);
+        System.out.println(data);
         return success(data);
     }
 
@@ -177,4 +209,61 @@ public class RmsCarrierController extends BaseRESTfulController {
         return success(list);
     }
 
+    /**
+     * 根据id获取中标区域
+     */
+    @ApiOperation(value="展示中标区域信息", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "406", required = false, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "id", value = "中标id", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getCarrierBidAreaList")
+    public RESTfulResult getCarrierBidAreaList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con){
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        //框计算
+        if (con != null) {
+            if (!"undefined".equals(con)) {
+                //设置要查询的索引名称
+                String index = "get_bidareas_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));
+            }
+        }
+        //初始化过滤
+        List<Map<String, Object>> listTotal = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapValue.size() == 0) {
+            //将查询结果存入索引中
+            listTotal = rmsCarrierService.getCarrierBidAreaList(null);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_bidareas_list");
+            //添加id
+            map.put("indexId", "bidAreasId");
+            listTotal.add(map);
+            //新建索引
+            String s = JSON.toJSONString(listTotal);
+            esFeign.insertIndex(listTotal);
+            //删除
+            listTotal.remove(listTotal.size() - 1);
+        }
+        if (listTotal == null) {
+            listTotal = rmsCarrierService.getCarrierBidAreaList(mapValue);
+        }
+        System.out.println(listTotal);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = rmsCarrierService.getCarrierBidAreaList(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId,listTotal, columnList);
+        return success(data);
+    }
+
 }

src/main/java/com/steerinfo/dil/controller/RmsOilPriceController.java

@@ -61,38 +61,6 @@ public class RmsOilPriceController extends BaseRESTfulController {
     @Autowired
     ESFeign esFeign;
 
-
-
-    /**
-     * 展示油价信息
-     * @param mapVal
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    //测试成功
-    @ApiOperation(value="展示油价信息", notes="分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "355", required = false, dataType = "BigDecimal"),
-    })
-    @PostMapping(value = "/getOilPriceList")
-    public RESTfulResult getOilPriceList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                         Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize
-                                          ){
-        List<Map<String,Object>> list = rmsOilPriceService.getOilPriceList(mapVal);
-        PageHelper.startPage(pageNum, pageSize);
-
-        //分页查询数据
-        List<Map<String, Object>> columnList = rmsOilPriceService.getOilPriceList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
-        return success(data);
-    }
-
     /**
      *增加新油价
      * @param rmsOilPrice
@@ -218,6 +186,4 @@ public class RmsOilPriceController extends BaseRESTfulController {
         return success(data);
     }
 
-
-
 }

src/main/java/com/steerinfo/dil/mapper/RmsBidAreaMapper.java

@@ -0,0 +1,17 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.RmsBidArea;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface RmsBidAreaMapper extends IBaseMapper<RmsBidArea, BigDecimal> {
+//    展示中标区域信息
+    List<Map<String, Object>> getCarrierBidAreaList();
+//根据id查询中标区域信息
+    Map<String, Object> getBidAreaById(BigDecimal id);
+}

src/main/java/com/steerinfo/dil/model/RmsBidArea.java

@@ -0,0 +1,184 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="承运商中标区域")
+public class RmsBidArea implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(BID_AREA_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal bidAreaId;
+
+    /**
+     * 中标区域所在省(BID_AREA_PROVINCE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="中标区域所在省",required=false)
+    private String bidAreaProvince;
+
+    /**
+     * 中标区域市(BID_AREA_CITY,VARCHAR,20)
+     */
+    @ApiModelProperty(value="中标区域市",required=false)
+    private String bidAreaCity;
+
+    /**
+     * 中标区域县(BID_AREA_COUNTY,VARCHAR,20)
+     */
+    @ApiModelProperty(value="中标区域县",required=false)
+    private String bidAreaCounty;
+
+    /**
+     * 中标区域乡镇(BID_AREA_COUNTRY,VARCHAR,20)
+     */
+    @ApiModelProperty(value="中标区域乡镇",required=false)
+    private String bidAreaCountry;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.bidAreaId;
+    }
+
+    @Override
+    public void setId(BigDecimal bidAreaId) {
+        this.bidAreaId = bidAreaId;
+    }
+
+    public BigDecimal getBidAreaId() {
+        return bidAreaId;
+    }
+
+    public void setBidAreaId(BigDecimal bidAreaId) {
+        this.bidAreaId = bidAreaId;
+    }
+
+    public String getBidAreaProvince() {
+        return bidAreaProvince;
+    }
+
+    public void setBidAreaProvince(String bidAreaProvince) {
+        this.bidAreaProvince = bidAreaProvince == null ? null : bidAreaProvince.trim();
+    }
+
+    public String getBidAreaCity() {
+        return bidAreaCity;
+    }
+
+    public void setBidAreaCity(String bidAreaCity) {
+        this.bidAreaCity = bidAreaCity == null ? null : bidAreaCity.trim();
+    }
+
+    public String getBidAreaCounty() {
+        return bidAreaCounty;
+    }
+
+    public void setBidAreaCounty(String bidAreaCounty) {
+        this.bidAreaCounty = bidAreaCounty == null ? null : bidAreaCounty.trim();
+    }
+
+    public String getBidAreaCountry() {
+        return bidAreaCountry;
+    }
+
+    public void setBidAreaCountry(String bidAreaCountry) {
+        this.bidAreaCountry = bidAreaCountry == null ? null : bidAreaCountry.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", bidAreaId=").append(bidAreaId);
+        sb.append(", bidAreaProvince=").append(bidAreaProvince);
+        sb.append(", bidAreaCity=").append(bidAreaCity);
+        sb.append(", bidAreaCounty=").append(bidAreaCounty);
+        sb.append(", bidAreaCountry=").append(bidAreaCountry);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/dil/service/IRmsBidAreaService.java

@@ -0,0 +1,25 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * RmsBidArea服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-12-20 11:32
+ * 类描述
+ * 修订历史：
+ * 日期：2021-12-20
+ * 作者：generator
+ * 参考：
+ * 描述：RmsBidArea服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IRmsBidAreaService{
+//    根据id查询中标区域信息
+    Map<String, Object> getBidAreaById(BigDecimal id);
+}

src/main/java/com/steerinfo/dil/service/IRmsCarrierService.java

@@ -30,4 +30,6 @@ public interface IRmsCarrierService {
     int insertCarrier(RmsCarrier rmsCarrier);
     //    根据id值展示承运商信息
     List<Map<String, Object>> getCarrierById(BigDecimal id);
+//    展示中标区域
+    List<Map<String, Object>> getCarrierBidAreaList(Map<String, Object> mapVal);
 }

src/main/java/com/steerinfo/dil/service/impl/RmsBidAreaServiceImpl.java

@@ -0,0 +1,36 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.RmsBidAreaMapper;
+import com.steerinfo.dil.service.IRmsBidAreaService;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * RmsBidArea服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-12-20 11:32
+ * 类描述
+ * 修订历史：
+ * 日期：2021-12-20
+ * 作者：generator
+ * 参考：
+ * 描述：RmsBidArea服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "rmsBidAreaService")
+public class RmsBidAreaServiceImpl implements IRmsBidAreaService {
+    @Autowired
+    RmsBidAreaMapper rmsBidAreaMapper;
+
+    @Override
+    public Map<String, Object> getBidAreaById(BigDecimal id) {
+        return rmsBidAreaMapper.getBidAreaById(id);
+    }
+}

src/main/java/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.mapper.RmsBidAreaMapper;
 import com.steerinfo.dil.mapper.RmsCarrierMapper;
 import com.steerinfo.dil.model.RmsCarrier;
 import com.steerinfo.dil.model.RmsShipper;
@@ -32,6 +33,8 @@ public class RmsCarrierServiceImpl implements IRmsCarrierService {
     @Autowired
     private RmsCarrierMapper rmsCarrierMapper;
 
+    @Autowired
+    private RmsBidAreaMapper rmsBidAreaMapper;
     /**
      * 查询承运商表
      * @return
@@ -126,4 +129,11 @@ public class RmsCarrierServiceImpl implements IRmsCarrierService {
         return rmsCarrierMapper.selectCarrierById(id);
     }
 
+    /**
+     * 展示中标区域
+     */
+    @Override
+    public List<Map<String, Object>> getCarrierBidAreaList(Map<String, Object> mapVal) {
+        return rmsBidAreaMapper.getCarrierBidAreaList();
+    }
 }

src/main/resources/com/steerinfo/dil/mapper/RmsBidAreaMapper.xml

@@ -0,0 +1,363 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.RmsBidAreaMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsBidArea">
+    <id column="BID_AREA_ID" jdbcType="DECIMAL" property="bidAreaId" />
+    <result column="BID_AREA_PROVINCE" jdbcType="VARCHAR" property="bidAreaProvince" />
+    <result column="BID_AREA_CITY" jdbcType="VARCHAR" property="bidAreaCity" />
+    <result column="BID_AREA_COUNTY" jdbcType="VARCHAR" property="bidAreaCounty" />
+    <result column="BID_AREA_COUNTRY" jdbcType="VARCHAR" property="bidAreaCountry" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+  </resultMap>
+  <sql id="columns">
+    BID_AREA_ID, BID_AREA_PROVINCE, BID_AREA_CITY, BID_AREA_COUNTY, BID_AREA_COUNTRY, 
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="columns_alias">
+    t.BID_AREA_ID, t.BID_AREA_PROVINCE, t.BID_AREA_CITY, t.BID_AREA_COUNTY, t.BID_AREA_COUNTRY, 
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM RMS_BID_AREA
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM RMS_BID_AREA t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="bidAreaId != null">
+        and BID_AREA_ID = #{bidAreaId}
+      </if>
+      <if test="bidAreaProvince != null and bidAreaProvince != ''">
+        and BID_AREA_PROVINCE = #{bidAreaProvince}
+      </if>
+      <if test="bidAreaCity != null and bidAreaCity != ''">
+        and BID_AREA_CITY = #{bidAreaCity}
+      </if>
+      <if test="bidAreaCounty != null and bidAreaCounty != ''">
+        and BID_AREA_COUNTY = #{bidAreaCounty}
+      </if>
+      <if test="bidAreaCountry != null and bidAreaCountry != ''">
+        and BID_AREA_COUNTRY = #{bidAreaCountry}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="bidAreaId != null">
+        and BID_AREA_ID = #{bidAreaId}
+      </if>
+      <if test="bidAreaProvince != null and bidAreaProvince != ''">
+        and BID_AREA_PROVINCE LIKE '%${bidAreaProvince}%'
+      </if>
+      <if test="bidAreaCity != null and bidAreaCity != ''">
+        and BID_AREA_CITY LIKE '%${bidAreaCity}%'
+      </if>
+      <if test="bidAreaCounty != null and bidAreaCounty != ''">
+        and BID_AREA_COUNTY LIKE '%${bidAreaCounty}%'
+      </if>
+      <if test="bidAreaCountry != null and bidAreaCountry != ''">
+        and BID_AREA_COUNTRY LIKE '%${bidAreaCountry}%'
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    delete from RMS_BID_AREA
+    where BID_AREA_ID = #{bidAreaId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from RMS_BID_AREA
+    where 1!=1 
+      <if test="bidAreaProvince != null and bidAreaProvince != ''">
+        or BID_AREA_PROVINCE = #{bidAreaProvince}
+      </if>
+      <if test="bidAreaCity != null and bidAreaCity != ''">
+        or BID_AREA_CITY = #{bidAreaCity}
+      </if>
+      <if test="bidAreaCounty != null and bidAreaCounty != ''">
+        or BID_AREA_COUNTY = #{bidAreaCounty}
+      </if>
+      <if test="bidAreaCountry != null and bidAreaCountry != ''">
+        or BID_AREA_COUNTRY = #{bidAreaCountry}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        or INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        or UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsBidArea">
+    insert into RMS_BID_AREA (BID_AREA_ID, BID_AREA_PROVINCE, BID_AREA_CITY, 
+      BID_AREA_COUNTY, BID_AREA_COUNTRY, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK)
+    values (#{bidAreaId,jdbcType=DECIMAL}, #{bidAreaProvince,jdbcType=VARCHAR}, #{bidAreaCity,jdbcType=VARCHAR}, 
+      #{bidAreaCounty,jdbcType=VARCHAR}, #{bidAreaCountry,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, 
+      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{insertUpdateRemark,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsBidArea">
+    insert into RMS_BID_AREA
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="bidAreaId != null">
+        BID_AREA_ID,
+      </if>
+      <if test="bidAreaProvince != null">
+        BID_AREA_PROVINCE,
+      </if>
+      <if test="bidAreaCity != null">
+        BID_AREA_CITY,
+      </if>
+      <if test="bidAreaCounty != null">
+        BID_AREA_COUNTY,
+      </if>
+      <if test="bidAreaCountry != null">
+        BID_AREA_COUNTRY,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="bidAreaId != null">
+        #{bidAreaId,jdbcType=DECIMAL},
+      </if>
+      <if test="bidAreaProvince != null">
+        #{bidAreaProvince,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCity != null">
+        #{bidAreaCity,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCounty != null">
+        #{bidAreaCounty,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCountry != null">
+        #{bidAreaCountry,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsBidArea">
+    update RMS_BID_AREA
+    set BID_AREA_PROVINCE = #{bidAreaProvince,jdbcType=VARCHAR},
+      BID_AREA_CITY = #{bidAreaCity,jdbcType=VARCHAR},
+      BID_AREA_COUNTY = #{bidAreaCounty,jdbcType=VARCHAR},
+      BID_AREA_COUNTRY = #{bidAreaCountry,jdbcType=VARCHAR},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
+    where BID_AREA_ID = #{bidAreaId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsBidArea">
+    update RMS_BID_AREA
+    <set>
+      <if test="bidAreaProvince != null">
+        BID_AREA_PROVINCE = #{bidAreaProvince,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCity != null">
+        BID_AREA_CITY = #{bidAreaCity,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCounty != null">
+        BID_AREA_COUNTY = #{bidAreaCounty,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCountry != null">
+        BID_AREA_COUNTRY = #{bidAreaCountry,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where BID_AREA_ID = #{bidAreaId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <include refid="select" />
+    where BID_AREA_ID = #{bidAreaId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into RMS_BID_AREA 
+      (BID_AREA_ID, 
+      BID_AREA_PROVINCE, BID_AREA_CITY, 
+      BID_AREA_COUNTY, BID_AREA_COUNTRY, 
+      INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.bidAreaId,jdbcType=DECIMAL}, 
+      #{item.bidAreaProvince,jdbcType=VARCHAR}, #{item.bidAreaCity,jdbcType=VARCHAR}, 
+      #{item.bidAreaCounty,jdbcType=VARCHAR}, #{item.bidAreaCountry,jdbcType=VARCHAR}, 
+      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
+      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update RMS_BID_AREA
+     set
+       BID_AREA_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaId,jdbcType=DECIMAL}
+       </foreach>
+       ,BID_AREA_PROVINCE=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaProvince,jdbcType=VARCHAR}
+       </foreach>
+       ,BID_AREA_CITY=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaCity,jdbcType=VARCHAR}
+       </foreach>
+       ,BID_AREA_COUNTY=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaCounty,jdbcType=VARCHAR}
+       </foreach>
+       ,BID_AREA_COUNTRY=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaCountry,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+     where BID_AREA_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.bidAreaId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from RMS_BID_AREA
+    where BID_AREA_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+<!--  展示中标区域信息-->
+  <select id="getCarrierBidAreaList" resultType="java.util.Map">
+    SELECT
+    RBA.BID_AREA_ID AS "bidAreaId",
+    RBA.BID_AREA_PROVINCE AS "bidAreaProvince",
+    RBA.BID_AREA_CITY AS "bidAreaCity",
+    RBA.BID_AREA_COUNTY AS "bidAreaCount",
+    RBA.BID_AREA_COUNTRY AS "bidAreaCountry"
+    FROM RMS_BID_AREA RBA
+  </select>
+<!--  根据id查询中标区域信息-->
+  <select id="getBidAreaById" resultType="java.util.Map">
+    SELECT
+    RBA.BID_AREA_PROVINCE AS "bidAreaProvince",
+    RBA.BID_AREA_CITY AS "bidAreaCity",
+    RBA.BID_AREA_COUNTY AS "bidAreaCount",
+    RBA.BID_AREA_COUNTRY AS "bidAreaCountry"
+    FROM RMS_BID_AREA RBA
+    WHERE RBA.BID_AREA_ID=#{id}
+  </select>
+</mapper>

src/test/java/com/steerinfo/dil/rmsbidarea/controller/RmsBidAreaController.java

@@ -0,0 +1,110 @@
+package com.steerinfo.dil.rmsbidarea.controller;
+
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.dil.rmsbidarea.model.RmsBidArea;
+import com.steerinfo.dil.rmsbidarea.service.IRmsBidAreaService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.math.BigDecimal;
+
+/**
+ * RmsBidArea RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-12-20 11:32
+ * 类描述
+ * 修订历史：
+ * 日期：2021-12-20
+ * 作者：generator
+ * 参考：
+ * 描述：RmsBidArea RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/rmsbidareas")
+public class RmsBidAreaController extends BaseRESTfulController {
+
+    @Autowired
+    IRmsBidAreaService rmsBidAreaService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("rmsbidarea:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<RmsBidArea> list = rmsBidAreaService.queryForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("rmsbidarea:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<RmsBidArea> list = rmsBidAreaService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据RmsBidArea对象创建")
+    @ApiImplicitParam(name = "rmsBidArea", value = "详细实体rmsBidArea", required = true, dataType = "RmsBidArea")
+    //@RequiresPermissions("rmsbidarea:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute RmsBidArea model){
+        RmsBidArea rmsBidArea = rmsBidAreaService.add(model);
+        return success(rmsBidArea);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short")
+    //@RequiresPermissions("rmsbidarea:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable Short id){
+        RmsBidArea rmsBidArea = rmsBidAreaService.getById(id);
+        return success(rmsBidArea);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的rmsBidArea信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short"),
+        @ApiImplicitParam(name = "rmsBidArea", value = "详细实体rmsBidArea", required = true, dataType = "RmsBidArea")
+    })
+    //@RequiresPermissions("rmsbidarea:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable Short id, @RequestBody RmsBidArea model){
+        model.setId(id);
+        RmsBidArea rmsBidArea = rmsBidAreaService.modify(model);
+        return success(rmsBidArea);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "Short")
+    //@RequiresPermissions("rmsbidarea:delete")
+    @DeleteMapping(value = "/{id}")//Short
+    public RESTfulResult delete(@PathVariable String id){
+    	List<String> list = Arrays.asList(id.split(","));
+    	if(ListUtils.isNotEmpty(list)) {
+	    	List<Short> ids = ListUtils.convertList(list);
+			  rmsBidAreaService.delete(ids);
+    	}
+      return success();
+    }
+}

src/test/java/com/steerinfo/dil/rmsbidarea/mapper/RmsBidAreaMapper.java

@@ -0,0 +1,10 @@
+package com.steerinfo.dil.rmsbidarea.mapper;
+
+import com.steerinfo.dil.rmsbidarea.model.RmsBidArea;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface RmsBidAreaMapper extends IBaseMapper<RmsBidArea, Short> {
+}

src/test/java/com/steerinfo/dil/rmsbidarea/mapper/RmsBidAreaMapper.xml

@@ -0,0 +1,683 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.rmsbidarea.mapper.RmsBidAreaMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.rmsbidarea.model.RmsBidArea">
+    <id column="BID_AREA_ID" jdbcType="DECIMAL" property="bidAreaId" />
+    <result column="BID_AREA_PROVINCE" jdbcType="VARCHAR" property="bidAreaProvince" />
+    <result column="BID_AREA_CITY" jdbcType="VARCHAR" property="bidAreaCity" />
+    <result column="BID_AREA_COUNTY" jdbcType="VARCHAR" property="bidAreaCounty" />
+    <result column="BID_AREA_COUNTRY" jdbcType="VARCHAR" property="bidAreaCountry" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+  </resultMap>
+  <sql id="columns">
+    BID_AREA_ID, BID_AREA_PROVINCE, BID_AREA_CITY, BID_AREA_COUNTY, BID_AREA_COUNTRY, 
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="columns_alias">
+    t.BID_AREA_ID, t.BID_AREA_PROVINCE, t.BID_AREA_CITY, t.BID_AREA_COUNTY, t.BID_AREA_COUNTRY, 
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM RMS_BID_AREA
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM RMS_BID_AREA t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="bidAreaId != null">
+        and BID_AREA_ID = #{bidAreaId}
+      </if>
+      <if test="bidAreaProvince != null and bidAreaProvince != ''">
+        and BID_AREA_PROVINCE = #{bidAreaProvince}
+      </if>
+      <if test="bidAreaCity != null and bidAreaCity != ''">
+        and BID_AREA_CITY = #{bidAreaCity}
+      </if>
+      <if test="bidAreaCounty != null and bidAreaCounty != ''">
+        and BID_AREA_COUNTY = #{bidAreaCounty}
+      </if>
+      <if test="bidAreaCountry != null and bidAreaCountry != ''">
+        and BID_AREA_COUNTRY = #{bidAreaCountry}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="bidAreaId != null">
+        and BID_AREA_ID = #{bidAreaId}
+      </if>
+      <if test="bidAreaProvince != null and bidAreaProvince != ''">
+        and BID_AREA_PROVINCE LIKE '%${bidAreaProvince}%'
+      </if>
+      <if test="bidAreaCity != null and bidAreaCity != ''">
+        and BID_AREA_CITY LIKE '%${bidAreaCity}%'
+      </if>
+      <if test="bidAreaCounty != null and bidAreaCounty != ''">
+        and BID_AREA_COUNTY LIKE '%${bidAreaCounty}%'
+      </if>
+      <if test="bidAreaCountry != null and bidAreaCountry != ''">
+        and BID_AREA_COUNTRY LIKE '%${bidAreaCountry}%'
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    delete from RMS_BID_AREA
+    where BID_AREA_ID = #{bidAreaId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from RMS_BID_AREA
+    where 1!=1 
+      <if test="bidAreaProvince != null and bidAreaProvince != ''">
+        or BID_AREA_PROVINCE = #{bidAreaProvince}
+      </if>
+      <if test="bidAreaCity != null and bidAreaCity != ''">
+        or BID_AREA_CITY = #{bidAreaCity}
+      </if>
+      <if test="bidAreaCounty != null and bidAreaCounty != ''">
+        or BID_AREA_COUNTY = #{bidAreaCounty}
+      </if>
+      <if test="bidAreaCountry != null and bidAreaCountry != ''">
+        or BID_AREA_COUNTRY = #{bidAreaCountry}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        or INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        or UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.rmsbidarea.model.RmsBidArea">
+    insert into RMS_BID_AREA (BID_AREA_ID, BID_AREA_PROVINCE, BID_AREA_CITY, 
+      BID_AREA_COUNTY, BID_AREA_COUNTRY, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK)
+    values (#{bidAreaId,jdbcType=DECIMAL}, #{bidAreaProvince,jdbcType=VARCHAR}, #{bidAreaCity,jdbcType=VARCHAR}, 
+      #{bidAreaCounty,jdbcType=VARCHAR}, #{bidAreaCountry,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, 
+      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{insertUpdateRemark,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.rmsbidarea.model.RmsBidArea">
+    insert into RMS_BID_AREA
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="bidAreaId != null">
+        BID_AREA_ID,
+      </if>
+      <if test="bidAreaProvince != null">
+        BID_AREA_PROVINCE,
+      </if>
+      <if test="bidAreaCity != null">
+        BID_AREA_CITY,
+      </if>
+      <if test="bidAreaCounty != null">
+        BID_AREA_COUNTY,
+      </if>
+      <if test="bidAreaCountry != null">
+        BID_AREA_COUNTRY,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="bidAreaId != null">
+        #{bidAreaId,jdbcType=DECIMAL},
+      </if>
+      <if test="bidAreaProvince != null">
+        #{bidAreaProvince,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCity != null">
+        #{bidAreaCity,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCounty != null">
+        #{bidAreaCounty,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCountry != null">
+        #{bidAreaCountry,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.rmsbidarea.model.RmsBidArea">
+    update RMS_BID_AREA
+    set BID_AREA_PROVINCE = #{bidAreaProvince,jdbcType=VARCHAR},
+      BID_AREA_CITY = #{bidAreaCity,jdbcType=VARCHAR},
+      BID_AREA_COUNTY = #{bidAreaCounty,jdbcType=VARCHAR},
+      BID_AREA_COUNTRY = #{bidAreaCountry,jdbcType=VARCHAR},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
+    where BID_AREA_ID = #{bidAreaId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.rmsbidarea.model.RmsBidArea">
+    update RMS_BID_AREA
+    <set>
+      <if test="bidAreaProvince != null">
+        BID_AREA_PROVINCE = #{bidAreaProvince,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCity != null">
+        BID_AREA_CITY = #{bidAreaCity,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCounty != null">
+        BID_AREA_COUNTY = #{bidAreaCounty,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCountry != null">
+        BID_AREA_COUNTRY = #{bidAreaCountry,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where BID_AREA_ID = #{bidAreaId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <include refid="select" />
+    where BID_AREA_ID = #{bidAreaId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into RMS_BID_AREA 
+      (BID_AREA_ID, 
+      BID_AREA_PROVINCE, BID_AREA_CITY, 
+      BID_AREA_COUNTY, BID_AREA_COUNTRY, 
+      INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.bidAreaId,jdbcType=DECIMAL}, 
+      #{item.bidAreaProvince,jdbcType=VARCHAR}, #{item.bidAreaCity,jdbcType=VARCHAR}, 
+      #{item.bidAreaCounty,jdbcType=VARCHAR}, #{item.bidAreaCountry,jdbcType=VARCHAR}, 
+      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
+      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update RMS_BID_AREA
+     set
+       BID_AREA_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaId,jdbcType=DECIMAL}
+       </foreach>
+       ,BID_AREA_PROVINCE=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaProvince,jdbcType=VARCHAR}
+       </foreach>
+       ,BID_AREA_CITY=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaCity,jdbcType=VARCHAR}
+       </foreach>
+       ,BID_AREA_COUNTY=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaCounty,jdbcType=VARCHAR}
+       </foreach>
+       ,BID_AREA_COUNTRY=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaCountry,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+     where BID_AREA_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.bidAreaId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from RMS_BID_AREA
+    where BID_AREA_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.rmsbidarea.model.RmsBidArea">
+    <id column="BID_AREA_ID" jdbcType="DECIMAL" property="bidAreaId" />
+    <result column="BID_AREA_PROVINCE" jdbcType="VARCHAR" property="bidAreaProvince" />
+    <result column="BID_AREA_CITY" jdbcType="VARCHAR" property="bidAreaCity" />
+    <result column="BID_AREA_COUNTY" jdbcType="VARCHAR" property="bidAreaCounty" />
+    <result column="BID_AREA_COUNTRY" jdbcType="VARCHAR" property="bidAreaCountry" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+  </resultMap>
+  <sql id="columns">
+    BID_AREA_ID, BID_AREA_PROVINCE, BID_AREA_CITY, BID_AREA_COUNTY, BID_AREA_COUNTRY, 
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="columns_alias">
+    t.BID_AREA_ID, t.BID_AREA_PROVINCE, t.BID_AREA_CITY, t.BID_AREA_COUNTY, t.BID_AREA_COUNTRY, 
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM RMS_BID_AREA
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM RMS_BID_AREA t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="bidAreaId != null">
+        and BID_AREA_ID = #{bidAreaId}
+      </if>
+      <if test="bidAreaProvince != null and bidAreaProvince != ''">
+        and BID_AREA_PROVINCE = #{bidAreaProvince}
+      </if>
+      <if test="bidAreaCity != null and bidAreaCity != ''">
+        and BID_AREA_CITY = #{bidAreaCity}
+      </if>
+      <if test="bidAreaCounty != null and bidAreaCounty != ''">
+        and BID_AREA_COUNTY = #{bidAreaCounty}
+      </if>
+      <if test="bidAreaCountry != null and bidAreaCountry != ''">
+        and BID_AREA_COUNTRY = #{bidAreaCountry}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="bidAreaId != null">
+        and BID_AREA_ID = #{bidAreaId}
+      </if>
+      <if test="bidAreaProvince != null and bidAreaProvince != ''">
+        and BID_AREA_PROVINCE LIKE '%${bidAreaProvince}%'
+      </if>
+      <if test="bidAreaCity != null and bidAreaCity != ''">
+        and BID_AREA_CITY LIKE '%${bidAreaCity}%'
+      </if>
+      <if test="bidAreaCounty != null and bidAreaCounty != ''">
+        and BID_AREA_COUNTY LIKE '%${bidAreaCounty}%'
+      </if>
+      <if test="bidAreaCountry != null and bidAreaCountry != ''">
+        and BID_AREA_COUNTRY LIKE '%${bidAreaCountry}%'
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    delete from RMS_BID_AREA
+    where BID_AREA_ID = #{bidAreaId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from RMS_BID_AREA
+    where 1!=1 
+      <if test="bidAreaProvince != null and bidAreaProvince != ''">
+        or BID_AREA_PROVINCE = #{bidAreaProvince}
+      </if>
+      <if test="bidAreaCity != null and bidAreaCity != ''">
+        or BID_AREA_CITY = #{bidAreaCity}
+      </if>
+      <if test="bidAreaCounty != null and bidAreaCounty != ''">
+        or BID_AREA_COUNTY = #{bidAreaCounty}
+      </if>
+      <if test="bidAreaCountry != null and bidAreaCountry != ''">
+        or BID_AREA_COUNTRY = #{bidAreaCountry}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        or INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        or UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.rmsbidarea.model.RmsBidArea">
+    insert into RMS_BID_AREA (BID_AREA_ID, BID_AREA_PROVINCE, BID_AREA_CITY, 
+      BID_AREA_COUNTY, BID_AREA_COUNTRY, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK)
+    values (#{bidAreaId,jdbcType=DECIMAL}, #{bidAreaProvince,jdbcType=VARCHAR}, #{bidAreaCity,jdbcType=VARCHAR}, 
+      #{bidAreaCounty,jdbcType=VARCHAR}, #{bidAreaCountry,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, 
+      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{insertUpdateRemark,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.rmsbidarea.model.RmsBidArea">
+    insert into RMS_BID_AREA
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="bidAreaId != null">
+        BID_AREA_ID,
+      </if>
+      <if test="bidAreaProvince != null">
+        BID_AREA_PROVINCE,
+      </if>
+      <if test="bidAreaCity != null">
+        BID_AREA_CITY,
+      </if>
+      <if test="bidAreaCounty != null">
+        BID_AREA_COUNTY,
+      </if>
+      <if test="bidAreaCountry != null">
+        BID_AREA_COUNTRY,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="bidAreaId != null">
+        #{bidAreaId,jdbcType=DECIMAL},
+      </if>
+      <if test="bidAreaProvince != null">
+        #{bidAreaProvince,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCity != null">
+        #{bidAreaCity,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCounty != null">
+        #{bidAreaCounty,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCountry != null">
+        #{bidAreaCountry,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.rmsbidarea.model.RmsBidArea">
+    update RMS_BID_AREA
+    set BID_AREA_PROVINCE = #{bidAreaProvince,jdbcType=VARCHAR},
+      BID_AREA_CITY = #{bidAreaCity,jdbcType=VARCHAR},
+      BID_AREA_COUNTY = #{bidAreaCounty,jdbcType=VARCHAR},
+      BID_AREA_COUNTRY = #{bidAreaCountry,jdbcType=VARCHAR},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
+    where BID_AREA_ID = #{bidAreaId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.rmsbidarea.model.RmsBidArea">
+    update RMS_BID_AREA
+    <set>
+      <if test="bidAreaProvince != null">
+        BID_AREA_PROVINCE = #{bidAreaProvince,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCity != null">
+        BID_AREA_CITY = #{bidAreaCity,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCounty != null">
+        BID_AREA_COUNTY = #{bidAreaCounty,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCountry != null">
+        BID_AREA_COUNTRY = #{bidAreaCountry,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where BID_AREA_ID = #{bidAreaId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <include refid="select" />
+    where BID_AREA_ID = #{bidAreaId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into RMS_BID_AREA 
+      (BID_AREA_ID, 
+      BID_AREA_PROVINCE, BID_AREA_CITY, 
+      BID_AREA_COUNTY, BID_AREA_COUNTRY, 
+      INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.bidAreaId,jdbcType=DECIMAL}, 
+      #{item.bidAreaProvince,jdbcType=VARCHAR}, #{item.bidAreaCity,jdbcType=VARCHAR}, 
+      #{item.bidAreaCounty,jdbcType=VARCHAR}, #{item.bidAreaCountry,jdbcType=VARCHAR}, 
+      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
+      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update RMS_BID_AREA
+     set
+       BID_AREA_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaId,jdbcType=DECIMAL}
+       </foreach>
+       ,BID_AREA_PROVINCE=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaProvince,jdbcType=VARCHAR}
+       </foreach>
+       ,BID_AREA_CITY=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaCity,jdbcType=VARCHAR}
+       </foreach>
+       ,BID_AREA_COUNTY=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaCounty,jdbcType=VARCHAR}
+       </foreach>
+       ,BID_AREA_COUNTRY=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaCountry,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+     where BID_AREA_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.bidAreaId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from RMS_BID_AREA
+    where BID_AREA_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+</mapper>

src/test/java/com/steerinfo/dil/rmsbidarea/model/RmsBidArea.java

@@ -0,0 +1,182 @@
+package com.steerinfo.dil.rmsbidarea.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+
+@ApiModel(value="承运商中标区域")
+public class RmsBidArea implements IBasePO<Short> {
+    /**
+     * 主键ID(BID_AREA_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private Short bidAreaId;
+
+    /**
+     * 中标区域所在省(BID_AREA_PROVINCE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="中标区域所在省",required=false)
+    private String bidAreaProvince;
+
+    /**
+     * 中标区域市(BID_AREA_CITY,VARCHAR,20)
+     */
+    @ApiModelProperty(value="中标区域市",required=false)
+    private String bidAreaCity;
+
+    /**
+     * 中标区域县(BID_AREA_COUNTY,VARCHAR,20)
+     */
+    @ApiModelProperty(value="中标区域县",required=false)
+    private String bidAreaCounty;
+
+    /**
+     * 中标区域乡镇(BID_AREA_COUNTRY,VARCHAR,20)
+     */
+    @ApiModelProperty(value="中标区域乡镇",required=false)
+    private String bidAreaCountry;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public Short getId() {
+        return this.bidAreaId;
+    }
+
+    @Override
+    public void setId(Short bidAreaId) {
+        this.bidAreaId = bidAreaId;
+    }
+
+    public Short getBidAreaId() {
+        return bidAreaId;
+    }
+
+    public void setBidAreaId(Short bidAreaId) {
+        this.bidAreaId = bidAreaId;
+    }
+
+    public String getBidAreaProvince() {
+        return bidAreaProvince;
+    }
+
+    public void setBidAreaProvince(String bidAreaProvince) {
+        this.bidAreaProvince = bidAreaProvince == null ? null : bidAreaProvince.trim();
+    }
+
+    public String getBidAreaCity() {
+        return bidAreaCity;
+    }
+
+    public void setBidAreaCity(String bidAreaCity) {
+        this.bidAreaCity = bidAreaCity == null ? null : bidAreaCity.trim();
+    }
+
+    public String getBidAreaCounty() {
+        return bidAreaCounty;
+    }
+
+    public void setBidAreaCounty(String bidAreaCounty) {
+        this.bidAreaCounty = bidAreaCounty == null ? null : bidAreaCounty.trim();
+    }
+
+    public String getBidAreaCountry() {
+        return bidAreaCountry;
+    }
+
+    public void setBidAreaCountry(String bidAreaCountry) {
+        this.bidAreaCountry = bidAreaCountry == null ? null : bidAreaCountry.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", bidAreaId=").append(bidAreaId);
+        sb.append(", bidAreaProvince=").append(bidAreaProvince);
+        sb.append(", bidAreaCity=").append(bidAreaCity);
+        sb.append(", bidAreaCounty=").append(bidAreaCounty);
+        sb.append(", bidAreaCountry=").append(bidAreaCountry);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/test/java/com/steerinfo/dil/rmsbidarea/service/IRmsBidAreaService.java

@@ -0,0 +1,23 @@
+package com.steerinfo.dil.rmsbidarea.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.dil.rmsbidarea.model.RmsBidArea;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * RmsBidArea服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-12-20 11:32
+ * 类描述
+ * 修订历史：
+ * 日期：2021-12-20
+ * 作者：generator
+ * 参考：
+ * 描述：RmsBidArea服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IRmsBidAreaService extends IBaseService<RmsBidArea, Short>{
+
+}

src/test/java/com/steerinfo/dil/rmsbidarea/service/impl/RmsBidAreaServiceImpl.java

@@ -0,0 +1,36 @@
+package com.steerinfo.dil.rmsbidarea.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.dil.rmsbidarea.model.RmsBidArea;
+import com.steerinfo.dil.rmsbidarea.mapper.RmsBidAreaMapper;
+import com.steerinfo.dil.rmsbidarea.service.IRmsBidAreaService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * RmsBidArea服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-12-20 11:32
+ * 类描述
+ * 修订历史：
+ * 日期：2021-12-20
+ * 作者：generator
+ * 参考：
+ * 描述：RmsBidArea服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "rmsBidAreaService")
+public class RmsBidAreaServiceImpl extends BaseServiceImpl<RmsBidArea, Short> implements IRmsBidAreaService {
+
+    @Autowired
+    private RmsBidAreaMapper rmsBidAreaMapper;
+
+    @Override
+    protected IBaseMapper<RmsBidArea, Short> getMapper() {
+        return rmsBidAreaMapper;
+    }
+}

target/classes/com/steerinfo/dil/mapper/RmsBidAreaMapper.xml

@@ -0,0 +1,363 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.RmsBidAreaMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsBidArea">
+    <id column="BID_AREA_ID" jdbcType="DECIMAL" property="bidAreaId" />
+    <result column="BID_AREA_PROVINCE" jdbcType="VARCHAR" property="bidAreaProvince" />
+    <result column="BID_AREA_CITY" jdbcType="VARCHAR" property="bidAreaCity" />
+    <result column="BID_AREA_COUNTY" jdbcType="VARCHAR" property="bidAreaCounty" />
+    <result column="BID_AREA_COUNTRY" jdbcType="VARCHAR" property="bidAreaCountry" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+  </resultMap>
+  <sql id="columns">
+    BID_AREA_ID, BID_AREA_PROVINCE, BID_AREA_CITY, BID_AREA_COUNTY, BID_AREA_COUNTRY, 
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="columns_alias">
+    t.BID_AREA_ID, t.BID_AREA_PROVINCE, t.BID_AREA_CITY, t.BID_AREA_COUNTY, t.BID_AREA_COUNTRY, 
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM RMS_BID_AREA
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM RMS_BID_AREA t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="bidAreaId != null">
+        and BID_AREA_ID = #{bidAreaId}
+      </if>
+      <if test="bidAreaProvince != null and bidAreaProvince != ''">
+        and BID_AREA_PROVINCE = #{bidAreaProvince}
+      </if>
+      <if test="bidAreaCity != null and bidAreaCity != ''">
+        and BID_AREA_CITY = #{bidAreaCity}
+      </if>
+      <if test="bidAreaCounty != null and bidAreaCounty != ''">
+        and BID_AREA_COUNTY = #{bidAreaCounty}
+      </if>
+      <if test="bidAreaCountry != null and bidAreaCountry != ''">
+        and BID_AREA_COUNTRY = #{bidAreaCountry}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="bidAreaId != null">
+        and BID_AREA_ID = #{bidAreaId}
+      </if>
+      <if test="bidAreaProvince != null and bidAreaProvince != ''">
+        and BID_AREA_PROVINCE LIKE '%${bidAreaProvince}%'
+      </if>
+      <if test="bidAreaCity != null and bidAreaCity != ''">
+        and BID_AREA_CITY LIKE '%${bidAreaCity}%'
+      </if>
+      <if test="bidAreaCounty != null and bidAreaCounty != ''">
+        and BID_AREA_COUNTY LIKE '%${bidAreaCounty}%'
+      </if>
+      <if test="bidAreaCountry != null and bidAreaCountry != ''">
+        and BID_AREA_COUNTRY LIKE '%${bidAreaCountry}%'
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    delete from RMS_BID_AREA
+    where BID_AREA_ID = #{bidAreaId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from RMS_BID_AREA
+    where 1!=1 
+      <if test="bidAreaProvince != null and bidAreaProvince != ''">
+        or BID_AREA_PROVINCE = #{bidAreaProvince}
+      </if>
+      <if test="bidAreaCity != null and bidAreaCity != ''">
+        or BID_AREA_CITY = #{bidAreaCity}
+      </if>
+      <if test="bidAreaCounty != null and bidAreaCounty != ''">
+        or BID_AREA_COUNTY = #{bidAreaCounty}
+      </if>
+      <if test="bidAreaCountry != null and bidAreaCountry != ''">
+        or BID_AREA_COUNTRY = #{bidAreaCountry}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        or INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        or UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsBidArea">
+    insert into RMS_BID_AREA (BID_AREA_ID, BID_AREA_PROVINCE, BID_AREA_CITY, 
+      BID_AREA_COUNTY, BID_AREA_COUNTRY, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK)
+    values (#{bidAreaId,jdbcType=DECIMAL}, #{bidAreaProvince,jdbcType=VARCHAR}, #{bidAreaCity,jdbcType=VARCHAR}, 
+      #{bidAreaCounty,jdbcType=VARCHAR}, #{bidAreaCountry,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, 
+      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{insertUpdateRemark,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsBidArea">
+    insert into RMS_BID_AREA
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="bidAreaId != null">
+        BID_AREA_ID,
+      </if>
+      <if test="bidAreaProvince != null">
+        BID_AREA_PROVINCE,
+      </if>
+      <if test="bidAreaCity != null">
+        BID_AREA_CITY,
+      </if>
+      <if test="bidAreaCounty != null">
+        BID_AREA_COUNTY,
+      </if>
+      <if test="bidAreaCountry != null">
+        BID_AREA_COUNTRY,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="bidAreaId != null">
+        #{bidAreaId,jdbcType=DECIMAL},
+      </if>
+      <if test="bidAreaProvince != null">
+        #{bidAreaProvince,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCity != null">
+        #{bidAreaCity,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCounty != null">
+        #{bidAreaCounty,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCountry != null">
+        #{bidAreaCountry,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsBidArea">
+    update RMS_BID_AREA
+    set BID_AREA_PROVINCE = #{bidAreaProvince,jdbcType=VARCHAR},
+      BID_AREA_CITY = #{bidAreaCity,jdbcType=VARCHAR},
+      BID_AREA_COUNTY = #{bidAreaCounty,jdbcType=VARCHAR},
+      BID_AREA_COUNTRY = #{bidAreaCountry,jdbcType=VARCHAR},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
+    where BID_AREA_ID = #{bidAreaId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsBidArea">
+    update RMS_BID_AREA
+    <set>
+      <if test="bidAreaProvince != null">
+        BID_AREA_PROVINCE = #{bidAreaProvince,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCity != null">
+        BID_AREA_CITY = #{bidAreaCity,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCounty != null">
+        BID_AREA_COUNTY = #{bidAreaCounty,jdbcType=VARCHAR},
+      </if>
+      <if test="bidAreaCountry != null">
+        BID_AREA_COUNTRY = #{bidAreaCountry,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where BID_AREA_ID = #{bidAreaId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <include refid="select" />
+    where BID_AREA_ID = #{bidAreaId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into RMS_BID_AREA 
+      (BID_AREA_ID, 
+      BID_AREA_PROVINCE, BID_AREA_CITY, 
+      BID_AREA_COUNTY, BID_AREA_COUNTRY, 
+      INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.bidAreaId,jdbcType=DECIMAL}, 
+      #{item.bidAreaProvince,jdbcType=VARCHAR}, #{item.bidAreaCity,jdbcType=VARCHAR}, 
+      #{item.bidAreaCounty,jdbcType=VARCHAR}, #{item.bidAreaCountry,jdbcType=VARCHAR}, 
+      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
+      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update RMS_BID_AREA
+     set
+       BID_AREA_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaId,jdbcType=DECIMAL}
+       </foreach>
+       ,BID_AREA_PROVINCE=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaProvince,jdbcType=VARCHAR}
+       </foreach>
+       ,BID_AREA_CITY=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaCity,jdbcType=VARCHAR}
+       </foreach>
+       ,BID_AREA_COUNTY=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaCounty,jdbcType=VARCHAR}
+       </foreach>
+       ,BID_AREA_COUNTRY=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.bidAreaCountry,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case BID_AREA_ID" separator=" ">
+          when #{item.bidAreaId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+     where BID_AREA_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.bidAreaId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from RMS_BID_AREA
+    where BID_AREA_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+<!--  展示中标区域信息-->
+  <select id="getCarrierBidAreaList" resultType="java.util.Map">
+    SELECT
+    RBA.BID_AREA_ID AS "bidAreaId",
+    RBA.BID_AREA_PROVINCE AS "bidAreaProvince",
+    RBA.BID_AREA_CITY AS "bidAreaCity",
+    RBA.BID_AREA_COUNTY AS "bidAreaCount",
+    RBA.BID_AREA_COUNTRY AS "bidAreaCountry"
+    FROM RMS_BID_AREA RBA
+  </select>
+<!--  根据id查询中标区域信息-->
+  <select id="getBidAreaById" resultType="java.util.Map">
+    SELECT
+    RBA.BID_AREA_PROVINCE AS "bidAreaProvince",
+    RBA.BID_AREA_CITY AS "bidAreaCity",
+    RBA.BID_AREA_COUNTY AS "bidAreaCount",
+    RBA.BID_AREA_COUNTRY AS "bidAreaCountry"
+    FROM RMS_BID_AREA RBA
+    WHERE RBA.BID_AREA_ID=#{id}
+  </select>
+</mapper>

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,122 @@
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\feign\ColumnDataFeign.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsTruckCalculateController.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsTruckCalculateService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsSupplierController.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsShipperService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsCarDriverServiceImpl.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsTruckCalculateMaterial.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsTruckCalculateMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsLineSegemntService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsGatepostRulesServiceImpl.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsDriverCapacity.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsWarehouse.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\interceptors\MyLocaleChangeInterceptor.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\config\CorsConfig1.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsMaterialSteel.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsPortController.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsMaterialTypeMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsPortServiceImpl.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsMaterialMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsLineSegemntMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsCarDriver.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsPortService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsTruckCalculateMaterialMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsWarehouseController.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsGatepostService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\feign\ESFeign.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsDriverCapacityMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsCarrier.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsUnitOfMeasureMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsPersonnelService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsMaterial.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsTruckCalculate.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsMaterialTypeController.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsSupplier.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsShipperController.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsGatepost.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsPersonnel.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsDriverCapacityServiceImpl.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsOilPriceController.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsPortStorageYardService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\DilApplicationMain.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsCapacityMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IDilNoticeService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsCapacityService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsLineSegemntController.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\util\DataConversionTool.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsSupplierService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsLinkMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsCarrierController.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsSupplierServiceImpl.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsPortMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsPierServiceImpl.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsPersonnelController.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsGatepostRulesMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsCarrierMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsTruckCalculateServiceImpl.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\DilNoticeServiceImpl.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsMaterialController.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsMaterialTypeService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsOilPriceMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsCarrierService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsCapacity.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsCarrierServiceImpl.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsPierController.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsWarehouseMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsUnitOfMeasure.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsShipperMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsPierMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\util\DataChange.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\util\PageListAdd.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsCarDriverMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsGatepostMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\util\BaseRESTfulController.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsPortStorageYard.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\feign\AmsFeign.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsPierService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsCapacityController.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsOilPriceService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsCarDriverController.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsLineService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsDriverCapacityService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsLineSegemnt.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsCarDriverService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsPort.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsOilPrice.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsLineController.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\DilNoticeController.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsPersonnelServiceImpl.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsPier.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsLinkService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsMaterialType.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsWarehouseService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsLineSegemntServiceImpl.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsPortStorageYardService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsGatepostController.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsPersonnelMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\DilNoticeMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsLinkController.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsMaterialService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsMaterialTypeServiceImpl.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsLinkServiceImpl.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\controller\RmsDriverCapacityController.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsMaterialSteelMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsShipper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\config\WebSocketConfig.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsLineMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsLink.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsLineServiceImpl.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\util\ColumnDataUtil.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsShipperServiceImpl.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsLine.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\util\util.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsMaterialServiceImpl.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsCapacityServiceImpl.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\CommonSeq.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsWarehouseServiceImpl.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsGatepostServiceImpl.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\IRmsGatepostRulesService.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\mapper\RmsSupplierMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\RmsGatepostRules.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\model\DilNotice.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\main\java\com\steerinfo\dil\service\impl\RmsOilPriceServiceImpl.java

target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

@@ -0,0 +1,5 @@
+com\steerinfo\dil\rmsbidarea\service\impl\RmsBidAreaServiceImpl.class
+com\steerinfo\dil\rmsbidarea\service\IRmsBidAreaService.class
+com\steerinfo\dil\rmsbidarea\mapper\RmsBidAreaMapper.class
+com\steerinfo\dil\rmsbidarea\model\RmsBidArea.class
+com\steerinfo\dil\rmsbidarea\controller\RmsBidAreaController.class

target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -0,0 +1,5 @@
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\test\java\com\steerinfo\dil\rmsbidarea\service\impl\RmsBidAreaServiceImpl.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\test\java\com\steerinfo\dil\rmsbidarea\mapper\RmsBidAreaMapper.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\test\java\com\steerinfo\dil\rmsbidarea\controller\RmsBidAreaController.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\test\java\com\steerinfo\dil\rmsbidarea\model\RmsBidArea.java
+C:\workspaces\stworkspace\12.20\DAL-DAZHOU-RMS-API\src\test\java\com\steerinfo\dil\rmsbidarea\service\IRmsBidAreaService.java