diff --git a/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml b/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml index 4c27784..6d7247c 100644 --- a/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml +++ b/.idea/libraries/Maven__com_alibaba_druid_1_1_10.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_10.xml b/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_10.xml index 74fcd43..a0c2f82 100644 --- a/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_10.xml +++ b/.idea/libraries/Maven__com_alibaba_druid_spring_boot_starter_1_1_10.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_57.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_57.xml index 260673c..1f6ea04 100644 --- a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_57.xml +++ b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_57.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_2_8_3.xml b/.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_2_8_3.xml index 910f84b..1d1ff9a 100644 --- a/.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_2_8_3.xml +++ b/.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_2_8_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_auth0_java_jwt_3_2_0.xml b/.idea/libraries/Maven__com_auth0_java_jwt_3_2_0.xml index e41abea..9094fb3 100644 --- a/.idea/libraries/Maven__com_auth0_java_jwt_3_2_0.xml +++ b/.idea/libraries/Maven__com_auth0_java_jwt_3_2_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_3_2.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_3_2.xml new file mode 100644 index 0000000..a123c48 --- /dev/null +++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_3_2.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_3_2.xml index 8a777e3..b1f83f2 100644 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_3_2.xml +++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_3_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_3_2.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_3_2.xml new file mode 100644 index 0000000..2808070 --- /dev/null +++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_3_2.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_3_2.xml index cd047b1..a4bf854 100644 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_3_2.xml +++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_3_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_3_2.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_3_2.xml index 873491e..3fea007 100644 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_3_2.xml +++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_3_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_3_2.xml b/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_3_2.xml index 9c3a4e8..8465367 100644 --- a/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_3_2.xml +++ b/.idea/libraries/Maven__com_baomidou_mybatis_plus_generator_3_3_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml index bbd3a88..b25a5a1 100644 --- a/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml +++ b/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml index 06441f4..8b2310a 100644 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_8.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_8.xml index 2c9ac2a..61be085 100644 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_8.xml +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_8.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_8.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_8.xml index c8ac135..6704002 100644 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_8.xml +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_8.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_9_8.xml b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_9_8.xml index 5ed1c65..47c0c37 100644 --- a/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_9_8.xml +++ b/.idea/libraries/Maven__com_fasterxml_jackson_dataformat_jackson_dataformat_yaml_2_9_8.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_8.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_8.xml index 6ca63f0..ea50c3b 100644 --- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_8.xml +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_8.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_8.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_8.xml index 1727927..82b3cb2 100644 --- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_8.xml +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_8.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_8.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_8.xml index d7711b9..d727c1b 100644 --- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_8.xml +++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_8.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_0.xml b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_0.xml new file mode 100644 index 0000000..bb4254d --- /dev/null +++ b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_0.xml b/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_0.xml deleted file mode 100644 index 93b26b4..0000000 --- a/.idea/libraries/Maven__com_github_jsqlparser_jsqlparser_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_10.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_10.xml deleted file mode 100644 index 1d21d3a..0000000 --- a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_4.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_4.xml new file mode 100644 index 0000000..1b9aa85 --- /dev/null +++ b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_5_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_5.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_5.xml index c7f35d7..3e09f74 100644 --- a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_5.xml +++ b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_autoconfigure_1_2_5.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_5.xml b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_5.xml index 351f755..3f21131 100644 --- a/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_5.xml +++ b/.idea/libraries/Maven__com_github_pagehelper_pagehelper_spring_boot_starter_1_2_5.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_20_0.xml b/.idea/libraries/Maven__com_google_guava_guava_20_0.xml index c5bd322..2fcb4ea 100644 --- a/.idea/libraries/Maven__com_google_guava_guava_20_0.xml +++ b/.idea/libraries/Maven__com_google_guava_guava_20_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_itextpdf_itext_asian_5_2_0.xml b/.idea/libraries/Maven__com_itextpdf_itext_asian_5_2_0.xml index 29d03ee..1a4f12e 100644 --- a/.idea/libraries/Maven__com_itextpdf_itext_asian_5_2_0.xml +++ b/.idea/libraries/Maven__com_itextpdf_itext_asian_5_2_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_itextpdf_itextpdf_5_5_9.xml b/.idea/libraries/Maven__com_itextpdf_itextpdf_5_5_9.xml index 4a96232..7e3af1c 100644 --- a/.idea/libraries/Maven__com_itextpdf_itextpdf_5_5_9.xml +++ b/.idea/libraries/Maven__com_itextpdf_itextpdf_5_5_9.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml index f19f6eb..148fe75 100644 --- a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml +++ b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml index b8581a6..21815c4 100644 --- a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml +++ b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml index 8f760a2..b695a02 100644 --- a/.idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml +++ b/.idea/libraries/Maven__com_zaxxer_HikariCP_3_2_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_8_3.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_8_3.xml index 52b553d..f783581 100644 --- a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_8_3.xml +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_8_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml index 4c8ff54..867287f 100644 --- a/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml index 66e6537..86a95b1 100644 --- a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml index 217d6e0..8388f10 100644 --- a/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml +++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_micrometer_micrometer_core_1_1_3.xml b/.idea/libraries/Maven__io_micrometer_micrometer_core_1_1_3.xml index 411a26f..7aebfd1 100644 --- a/.idea/libraries/Maven__io_micrometer_micrometer_core_1_1_3.xml +++ b/.idea/libraries/Maven__io_micrometer_micrometer_core_1_1_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml index 03588dc..8c14e82 100644 --- a/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml +++ b/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml index 4a47148..a9a05a2 100644 --- a/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml +++ b/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml index f934649..f36d89c 100644 --- a/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml +++ b/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml index 7898a19..d6e0e95 100644 --- a/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml +++ b/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml index 4ed7d0d..ee94f12 100644 --- a/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml +++ b/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml index c40ef9f..9c32dea 100644 --- a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml +++ b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml index 0700f01..3a76c9f 100644 --- a/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml +++ b/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml index 1c4a621..0df79dc 100644 --- a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml +++ b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml index 395508f..30e6566 100644 --- a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml +++ b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml index e74f3ab..2582da5 100644 --- a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml +++ b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_inject_javax_inject_1.xml b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml index 93cf65a..b3b6563 100644 --- a/.idea/libraries/Maven__javax_inject_javax_inject_1.xml +++ b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_persistence_persistence_api_1_0.xml b/.idea/libraries/Maven__javax_persistence_persistence_api_1_0.xml index e60370e..89194ea 100644 --- a/.idea/libraries/Maven__javax_persistence_persistence_api_1_0.xml +++ b/.idea/libraries/Maven__javax_persistence_persistence_api_1_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml index 6978c0b..36ff992 100644 --- a/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml +++ b/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml index d411041..0402162 100644 --- a/.idea/libraries/Maven__junit_junit_4_12.xml +++ b/.idea/libraries/Maven__junit_junit_4_12.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_15.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_15.xml index 2090d5f..b7e51f1 100644 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_15.xml +++ b/.idea/libraries/Maven__mysql_mysql_connector_java_8_0_15.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_10.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_10.xml index 9bddfcc..5119f7c 100644 --- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_10.xml +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_10.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_10.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_10.xml index b82578b..ae3cb8d 100644 --- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_10.xml +++ b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_10.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml index b3d3858..2d53489 100644 --- a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml +++ b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml index 1083023..53caef0 100644 --- a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml +++ b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_trove4j_core_3_1_0.xml b/.idea/libraries/Maven__net_sf_trove4j_core_3_1_0.xml index 9460109..41b95be 100644 --- a/.idea/libraries/Maven__net_sf_trove4j_core_3_1_0.xml +++ b/.idea/libraries/Maven__net_sf_trove4j_core_3_1_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml index 28edf49..ce21017 100644 --- a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_7.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_7.xml index 18d2e57..c017d74 100644 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_7.xml +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_7.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_11.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_11.xml index e5fd71a..3b067ef 100644 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_11.xml +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_11.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml index fe93f54..cfed1f8 100644 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_11_2.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_11_2.xml index c7e1697..8e86b93 100644 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_11_2.xml +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_11_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_11_2.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_11_2.xml index de1b839..bcfb81b 100644 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_11_2.xml +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_11_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_11_2.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_11_2.xml index 3959614..83f8fef 100644 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_11_2.xml +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_11_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_3_2.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_3_2.xml index b5977cf..ea635df 100644 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_3_2.xml +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_3_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_3_2.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_3_2.xml index 7c19172..a55ad65 100644 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_3_2.xml +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_3_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_3_2.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_3_2.xml index 2b73222..23d56b3 100644 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_3_2.xml +++ b/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_3_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_16.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_16.xml index 929312a..de1f876 100644 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_16.xml +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_16.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_16.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_16.xml index 74ec958..d16b1e1 100644 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_16.xml +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_16.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_16.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_16.xml index df5f897..ab9af1b 100644 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_16.xml +++ b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_16.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_2.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_2.xml index a1f3d90..533f1df 100644 --- a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_2.xml +++ b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_9_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml index 4d16d46..25dd578 100644 --- a/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml +++ b/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_55.xml b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_55.xml index a2576d9..b00fbf8 100644 --- a/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_55.xml +++ b/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_55.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_freemarker_freemarker_2_3_28.xml b/.idea/libraries/Maven__org_freemarker_freemarker_2_3_28.xml index 3471c5b..9a642c4 100644 --- a/.idea/libraries/Maven__org_freemarker_freemarker_2_3_28.xml +++ b/.idea/libraries/Maven__org_freemarker_freemarker_2_3_28.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml index f58bbc1..c08f689 100644 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml index 78dbe45..a9c0e75 100644 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml b/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml index 04cc804..cc78cbd 100644 --- a/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml +++ b/.idea/libraries/Maven__org_hdrhistogram_HdrHistogram_2_1_9.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_14_Final.xml b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_14_Final.xml index 9fcad3a..749f527 100644 --- a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_14_Final.xml +++ b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_14_Final.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml index 5f7dd01..5558f17 100644 --- a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml +++ b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jdom_jdom_1_1.xml b/.idea/libraries/Maven__org_jdom_jdom_1_1.xml index a6eefaf..e5e3892 100644 --- a/.idea/libraries/Maven__org_jdom_jdom_1_1.xml +++ b/.idea/libraries/Maven__org_jdom_jdom_1_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml b/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml index bf68169..e58acf9 100644 --- a/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml +++ b/.idea/libraries/Maven__org_latencyutils_LatencyUtils_2_0_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml index 87cb599..252cf0d 100644 --- a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml +++ b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml b/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml index 159204f..338aa83 100644 --- a/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml +++ b/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_generator_mybatis_generator_core_1_3_5.xml b/.idea/libraries/Maven__org_mybatis_generator_mybatis_generator_core_1_3_5.xml index fe90c48..a9b199f 100644 --- a/.idea/libraries/Maven__org_mybatis_generator_mybatis_generator_core_1_3_5.xml +++ b/.idea/libraries/Maven__org_mybatis_generator_mybatis_generator_core_1_3_5.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml b/.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml index 377b7a7..6b47224 100644 --- a/.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml +++ b/.idea/libraries/Maven__org_mybatis_mybatis_3_4_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml b/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml index 713f604..d87f74f 100644 --- a/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml +++ b/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_2.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_2.xml index af2905f..e9899fe 100644 --- a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_2.xml +++ b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_2.xml b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_2.xml index 6cce5e6..6721de4 100644 --- a/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_2.xml +++ b/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml index af41e3b..e4c4e7e 100644 --- a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml +++ b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml index 0bf8cf2..9fd46eb 100644 --- a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml +++ b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_16_16.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_16_16.xml index 66c713e..962c59f 100644 --- a/.idea/libraries/Maven__org_projectlombok_lombok_1_16_16.xml +++ b/.idea/libraries/Maven__org_projectlombok_lombok_1_16_16.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml index c4c54d6..0933d6e 100644 --- a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml +++ b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml index 6073e53..d99176b 100644 --- a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml index 20e8163..53fa5cc 100644 --- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_3_RELEASE.xml index c3be9f6..4ad6b09 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_3_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_1_3_RELEASE.xml index 90d43e9..278c348 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_1_3_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_2_1_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_1_3_RELEASE.xml index 7b5f00e..cd24219 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_1_3_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_1_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_3_RELEASE.xml index 47e97e2..8a99627 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_3_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_3_RELEASE.xml index e6965e9..31fa736 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_3_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_3_RELEASE.xml index 00b99ed..850e01d 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_3_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_1_3_RELEASE.xml index ea80931..1cb4b73 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_1_3_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_2_1_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_1_3_RELEASE.xml index 231787b..3b64879 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_1_3_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_1_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_1_3_RELEASE.xml index db7bfa5..ea2af09 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_1_3_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_freemarker_2_1_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_3_RELEASE.xml index f68e351..abaf57a 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_3_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_1_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_3_RELEASE.xml index b203930..87446d9 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_3_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_2_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_2_1_3_RELEASE.xml index 054f8c3..b866627 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_2_1_3_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_2_1_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_3_RELEASE.xml index e0710ae..f17d365 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_3_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_3_RELEASE.xml index 6403bb0..97c6b38 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_3_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_3_RELEASE.xml index 5a12f81..a6371d3 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_3_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_3_RELEASE.xml index c97dded..1021583 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_3_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_3_RELEASE.xml index d4634f7..a1074a2 100644 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_3_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_3_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml index fbc0452..4896056 100644 --- a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml index 7e6f096..10533e4 100644 --- a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_1_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_1_5_RELEASE.xml index 7690fda..bf6fcfd 100644 --- a/.idea/libraries/Maven__org_springframework_spring_aop_5_1_5_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_aop_5_1_5_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_1_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_1_5_RELEASE.xml index 4e3bb14..845e99c 100644 --- a/.idea/libraries/Maven__org_springframework_spring_beans_5_1_5_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_beans_5_1_5_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_1_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_1_5_RELEASE.xml index e32f9b7..1670ebe 100644 --- a/.idea/libraries/Maven__org_springframework_spring_context_5_1_5_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_context_5_1_5_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_5_RELEASE.xml index 97d1325..2e43c58 100644 --- a/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_5_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_5_1_5_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_1_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_1_5_RELEASE.xml index ad54c38..0f7dcc9 100644 --- a/.idea/libraries/Maven__org_springframework_spring_core_5_1_5_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_core_5_1_5_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_1_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_1_5_RELEASE.xml index 456f68e..e465ad5 100644 --- a/.idea/libraries/Maven__org_springframework_spring_expression_5_1_5_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_expression_5_1_5_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_5_RELEASE.xml index 28bc49a..dafd654 100644 --- a/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_5_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_5_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_5_RELEASE.xml index f416e50..556251b 100644 --- a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_5_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_1_5_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_1_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_1_5_RELEASE.xml index b0a226e..8fa98c7 100644 --- a/.idea/libraries/Maven__org_springframework_spring_test_5_1_5_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_test_5_1_5_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_1_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_1_5_RELEASE.xml index 784b25f..4b1279a 100644 --- a/.idea/libraries/Maven__org_springframework_spring_tx_5_1_5_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_tx_5_1_5_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_1_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_1_5_RELEASE.xml index b8a2414..00e5b8c 100644 --- a/.idea/libraries/Maven__org_springframework_spring_web_5_1_5_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_web_5_1_5_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_5_RELEASE.xml index b712d4f..9a1964c 100644 --- a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_5_RELEASE.xml +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_5_RELEASE.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml index 9f44657..48b82f3 100644 --- a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml +++ b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml index 7e63769..070a41f 100644 --- a/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml +++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__tk_mybatis_mapper_base_1_0_1.xml b/.idea/libraries/Maven__tk_mybatis_mapper_base_1_0_1.xml index d02f759..6831388 100644 --- a/.idea/libraries/Maven__tk_mybatis_mapper_base_1_0_1.xml +++ b/.idea/libraries/Maven__tk_mybatis_mapper_base_1_0_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__tk_mybatis_mapper_core_1_0_2.xml b/.idea/libraries/Maven__tk_mybatis_mapper_core_1_0_2.xml index 8c4397f..395173f 100644 --- a/.idea/libraries/Maven__tk_mybatis_mapper_core_1_0_2.xml +++ b/.idea/libraries/Maven__tk_mybatis_mapper_core_1_0_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__tk_mybatis_mapper_extra_1_0_1.xml b/.idea/libraries/Maven__tk_mybatis_mapper_extra_1_0_1.xml index fb80b11..ff832a4 100644 --- a/.idea/libraries/Maven__tk_mybatis_mapper_extra_1_0_1.xml +++ b/.idea/libraries/Maven__tk_mybatis_mapper_extra_1_0_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__tk_mybatis_mapper_spring_1_0_1.xml b/.idea/libraries/Maven__tk_mybatis_mapper_spring_1_0_1.xml index 315e9de..89c92b4 100644 --- a/.idea/libraries/Maven__tk_mybatis_mapper_spring_1_0_1.xml +++ b/.idea/libraries/Maven__tk_mybatis_mapper_spring_1_0_1.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__tk_mybatis_mapper_spring_boot_autoconfigure_2_0_2.xml b/.idea/libraries/Maven__tk_mybatis_mapper_spring_boot_autoconfigure_2_0_2.xml index 93380db..9f5f25a 100644 --- a/.idea/libraries/Maven__tk_mybatis_mapper_spring_boot_autoconfigure_2_0_2.xml +++ b/.idea/libraries/Maven__tk_mybatis_mapper_spring_boot_autoconfigure_2_0_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__tk_mybatis_mapper_spring_boot_starter_2_0_2.xml b/.idea/libraries/Maven__tk_mybatis_mapper_spring_boot_starter_2_0_2.xml index a5c7497..40e49fc 100644 --- a/.idea/libraries/Maven__tk_mybatis_mapper_spring_boot_starter_2_0_2.xml +++ b/.idea/libraries/Maven__tk_mybatis_mapper_spring_boot_starter_2_0_2.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__tk_mybatis_mapper_weekend_1_1_3.xml b/.idea/libraries/Maven__tk_mybatis_mapper_weekend_1_1_3.xml index 849d4b7..b63873e 100644 --- a/.idea/libraries/Maven__tk_mybatis_mapper_weekend_1_1_3.xml +++ b/.idea/libraries/Maven__tk_mybatis_mapper_weekend_1_1_3.xml @@ -1,13 +1,13 @@ - + - + - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index d0166bd..0258972 100644 --- a/pom.xml +++ b/pom.xml @@ -81,12 +81,12 @@ 1.3.5 - - - com.github.pagehelper - pagehelper - 5.1.10 - + + + + + + @@ -146,6 +146,17 @@ mysql mysql-connector-java + + com.baomidou + mybatis-plus-boot-starter + 3.3.2 + + + org.javassist + javassist + + + com.baomidou mybatis-plus-generator diff --git a/sadia-game.iml b/sadia-game.iml index b3654f0..a472f7a 100644 --- a/sadia-game.iml +++ b/sadia-game.iml @@ -90,8 +90,6 @@ - - @@ -132,6 +130,8 @@ + + @@ -141,6 +141,8 @@ + + diff --git a/src/main/java/com/jingcheng/template/conf/MybatisPlusConfig.java b/src/main/java/com/jingcheng/template/conf/MybatisPlusConfig.java new file mode 100644 index 0000000..a4afdde --- /dev/null +++ b/src/main/java/com/jingcheng/template/conf/MybatisPlusConfig.java @@ -0,0 +1,22 @@ +package com.jingcheng.template.conf; + +import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.transaction.annotation.EnableTransactionManagement; + + +@EnableTransactionManagement +@Configuration +public class MybatisPlusConfig { + + /** + * 分页插件 + */ + @Bean + public PaginationInterceptor paginationInterceptor() { + return new PaginationInterceptor(); + } + + +} \ No newline at end of file diff --git a/src/main/java/com/jingcheng/template/controller/AwardRecordController.java b/src/main/java/com/jingcheng/template/controller/AwardRecordController.java index b1ed513..e9ba0d4 100644 --- a/src/main/java/com/jingcheng/template/controller/AwardRecordController.java +++ b/src/main/java/com/jingcheng/template/controller/AwardRecordController.java @@ -50,12 +50,13 @@ public class AwardRecordController extends BaseController { +public interface AwardRecordMapper extends CommonMapper,BaseMapper { } diff --git a/src/main/java/com/jingcheng/template/model/AwardRecord.java b/src/main/java/com/jingcheng/template/model/AwardRecord.java index b19a287..bda5bd8 100644 --- a/src/main/java/com/jingcheng/template/model/AwardRecord.java +++ b/src/main/java/com/jingcheng/template/model/AwardRecord.java @@ -15,6 +15,8 @@ public class AwardRecord extends BaseEntity{ private Long userId; + private String source; + private String name; private String phone; diff --git a/src/main/java/com/jingcheng/template/service/AwardRecordService.java b/src/main/java/com/jingcheng/template/service/AwardRecordService.java index e230e86..d641fff 100644 --- a/src/main/java/com/jingcheng/template/service/AwardRecordService.java +++ b/src/main/java/com/jingcheng/template/service/AwardRecordService.java @@ -1,7 +1,9 @@ package com.jingcheng.template.service; import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; import com.jingcheng.template.util.AjaxResult; +import com.jingcheng.template.vo.AwardRecordVo; public interface AwardRecordService extends BaseService { @@ -15,9 +17,10 @@ public interface AwardRecordService extends BaseService extends BaseService queryWrapper = new QueryWrapper<>(); + if (null != awardType){ + queryWrapper.ge("state", 1) + .ge("award_type",awardType); + }else { + queryWrapper.ge("state", 1); + } + Page page = new Page<>(pageNum, pageSize, true); + IPage iPage = awardRecordMapper.selectPage(page, queryWrapper); + List awardRecordList = iPage.getRecords(); + Long total = iPage.getTotal(); + List awardRecordVoList = new ArrayList<>(); + for (AwardRecord awardRecord:awardRecordList){ + Long userId = awardRecord.getUserId(); + Users users = usersMapper.selectByPrimaryKey(userId); + AwardRecordVo awardRecordVo = new AwardRecordVo(); + awardRecordVo.setOpenId(users.getOpenId()); + if ( 0 == awardRecord.getAwardType()){ + awardRecordVo.setIsAward("否"); + }else { + awardRecordVo.setIsAward("是"); + } + awardRecordVo.setId(awardRecord.getId()); + awardRecordVo.setUserId(awardRecord.getUserId()); + awardRecordVo.setName(awardRecord.getName()); + awardRecordVo.setPhone(awardRecord.getPhone()); + awardRecordVo.setMail(awardRecord.getMail()); + awardRecordVo.setAddress(awardRecord.getAddress()); + awardRecordVo.setAwardTimes(awardRecord.getAwardTimes()); + awardRecordVo.setSource(awardRecord.getSource()); + awardRecordVo.setCreateDateTime(awardRecord.getCreateDateTime()); + awardRecordVo.setAwardDate(simpleDateFormat.format(awardRecord.getCreateDateTime())); + awardRecordVoList.add(awardRecordVo); + } + JSONObject result = new JSONObject(); + result.put("list",awardRecordVoList); + result.put("total",total); + result.put("pageNum",pageNum); + result.put("pageSize",pageSize); + result.put("pages",(int) Math.ceil(Double.valueOf(total) / Double.valueOf(pageSize))); + ajaxResult.setData(result); + ajaxResult.setRetcode(AjaxResult.SUCCESS); + return ajaxResult; + } } diff --git a/src/main/java/com/jingcheng/template/vo/AwardRecordVo.java b/src/main/java/com/jingcheng/template/vo/AwardRecordVo.java new file mode 100644 index 0000000..7b5e2d4 --- /dev/null +++ b/src/main/java/com/jingcheng/template/vo/AwardRecordVo.java @@ -0,0 +1,16 @@ +package com.jingcheng.template.vo; + +import com.jingcheng.template.model.AwardRecord; +import lombok.Data; + +@Data +public class AwardRecordVo extends AwardRecord { + /** + * 是否中奖 + */ + private String isAward; + + private String openId; + + private String awardDate; +}