|
@@ -2,187 +2,7 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="2054d288-d3d9-47a2-840a-057f9d2a0c35" name="Default" comment="">
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/ant.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_11.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_11.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_druid_1_1_6.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_alibaba_fastjson_1_2_42.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_aliyun_oss_aliyun_sdk_oss_2_8_3.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_0.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_10.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_10.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_2.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_2_0.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_qiniu_happy_dns_java_0_1_6.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_qiniu_qiniu_java_sdk_7_2_11.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okhttp3_okhttp_3_8_0.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_squareup_okio_okio_1_13_0.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_io_commons_io_2_5.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_44.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__nz_net_ultraq_thymeleaf_thymeleaf_layout_dialect_1_4_0.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ognl_ognl_3_0_8.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_7.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_4_3.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_3.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_8.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_23.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_23.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_23.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_8_5_23.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_23.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_23.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_2_6_0.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_4_13.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_3_6_Final.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_javassist_javassist_3_21_0_GA.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_1_Final.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jdom_jdom_1_1.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_3_4_5.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_3_1.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_3_1.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_4_0.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_25.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_5_9_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_9_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_5_9_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_1_5_9_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_1_5_9_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_5_9_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_5_9_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_5_9_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_1_5_9_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_5_9_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_5_9_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_1_5_9_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_1_5_9_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_commons_1_13_9_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_1_2_9_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_data_spring_data_redis_1_8_9_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_4_3_13_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_4_3_13_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_4_3_13_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_support_4_3_13_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_4_3_13_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_4_3_13_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jdbc_4_3_13_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_oxm_4_3_13_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_4_3_13_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_tx_4_3_13_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_4_3_13_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_13_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_thymeleaf_2_1_6_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring4_2_1_6_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_unbescape_unbescape_1_1_0_RELEASE.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/shop.iml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/DoctorManageController.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/EquipmentController.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/NewLabelController.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/NewsManagerController.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/bean/BottomPageBean.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/bean/DoctorBean.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/bean/EquipmentBean.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/bean/NewBean.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/DoctorController.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/DoctorMapper.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/EquipmentMapper.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/NewLabelMapper.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/NewMapper.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/entry/Doctor.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/entry/Equipment.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/entry/NewBase.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/entry/NewLabel.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/entry/NewType.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/DoctorService.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/EquipmentService.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/NewLabelService.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/NewService.java" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/resource/logback-spring-dev.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/resource/mapper/DoctorMapper.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/resource/mapper/EquipmentMapper.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/resource/mapper/NewLabelMapper.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/src/main/resource/mapper/NewMapper.xml" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/static/js/main.js" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/static/js/news.js" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/static/style/doctors.css" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/static/style/inquire.css" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/static/style/main.css" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/static/style/nHeader.css" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/static/style/news.css" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/static/style/newsDetails.css" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/static/style/setmeal.css" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/static/style/smallBanner.css" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/static/style/specialist.css" />
|
|
|
- <change beforePath="" afterPath="$PROJECT_DIR$/shop/static/style/subscribe.css" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/AbstractController.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/AbstractController.java" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/SysLabelController.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/SysLabelController.java" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/bean/GoodPriceBean.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/bean/GoodPriceBean.java" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/h5/H5IndexController.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/h5/H5IndexController.java" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/BuyOrderController.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/BuyOrderController.java" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/GoodController.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/GoodController.java" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/IndexController.java" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/InfoController.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/pc/InfoController.java" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/SysLabelMapper.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/SysLabelMapper.java" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/entry/GoodPrice.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/entry/GoodPrice.java" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/entry/SysLabel.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/entry/SysLabel.java" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/GoodService.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/GoodService.java" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/OssService.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/OssService.java" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/ShopConfigService.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/ShopConfigService.java" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/SysLabelService.java" afterPath="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/SysLabelService.java" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/resource/application-dev.properties" afterPath="$PROJECT_DIR$/shop/src/main/resource/application-dev.properties" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/resource/application-test.properties" afterPath="$PROJECT_DIR$/shop/src/main/resource/application-test.properties" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/resource/mapper/SysLabelMapper.xml" afterPath="$PROJECT_DIR$/shop/src/main/resource/mapper/SysLabelMapper.xml" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/appointment.html" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/appointment.html" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/changeappointment.html" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/changeappointment.html" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/detail.html" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/detail.html" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/edit_people.html" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/edit_people.html" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/family.html" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/family.html" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/fqa.html" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/fqa.html" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/fragments.html" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/fragments.html" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/info.html" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/info.html" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/mypayedorders.html" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/mypayedorders.html" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/pay.html" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/pay.html" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/query_report.html" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/query_report.html" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/query_reportv2.html" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/query_reportv2.html" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/report_detail.html" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/report_detail.html" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/src/main/resource/templates/shop.html" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/shop.html" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/static/manager/build/webpack.dev.conf.js" afterPath="$PROJECT_DIR$/shop/static/manager/build/webpack.dev.conf.js" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/static/manager/config/dev.env.js" afterPath="$PROJECT_DIR$/shop/static/manager/config/dev.env.js" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/static/manager/config/index.js" afterPath="$PROJECT_DIR$/shop/static/manager/config/index.js" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/static/manager/src/api/index.js" afterPath="$PROJECT_DIR$/shop/static/manager/src/api/index.js" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/static/manager/src/components/Header.vue" afterPath="$PROJECT_DIR$/shop/static/manager/src/components/Header.vue" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/static/manager/src/components/Sidebar.vue" afterPath="$PROJECT_DIR$/shop/static/manager/src/components/Sidebar.vue" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/static/manager/src/components/page/EditLabel.vue" afterPath="$PROJECT_DIR$/shop/static/manager/src/components/page/EditLabel.vue" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/static/manager/src/components/page/SysLabelManager.vue" afterPath="$PROJECT_DIR$/shop/static/manager/src/components/page/SysLabelManager.vue" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/static/manager/src/components/page/config/EditShopConfig.vue" afterPath="$PROJECT_DIR$/shop/static/manager/src/components/page/config/EditShopConfig.vue" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/static/manager/src/components/page/config/EditShopConfigType2.vue" afterPath="$PROJECT_DIR$/shop/static/manager/src/components/page/config/EditShopConfigType2.vue" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/static/manager/src/router/index.js" afterPath="$PROJECT_DIR$/shop/static/manager/src/router/index.js" />
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/static/style/shop.css" afterPath="$PROJECT_DIR$/shop/static/style/shop.css" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/shop/static/manager/config/prod.env.js" afterPath="$PROJECT_DIR$/shop/static/manager/config/prod.env.js" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/shop/target/" />
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
@@ -209,16 +29,6 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
- <file leaf-file-name="doctors.css" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/shop/static/style/doctors.css">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="1185">
|
|
|
- <caret line="79" column="0" lean-forward="false" selection-start-line="79" selection-start-column="0" selection-end-line="79" selection-end-column="0" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
<file leaf-file-name="main.js" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/shop/static/js/main.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
@@ -231,16 +41,6 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="setmeal.css" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/shop/static/style/setmeal.css">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="3450">
|
|
|
- <caret line="230" column="0" lean-forward="false" selection-start-line="230" selection-start-column="0" selection-end-line="230" selection-end-column="0" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
<file leaf-file-name="main.css" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/shop/static/style/main.css">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
@@ -271,7 +71,7 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="application-test.properties" pinned="false" current-in-tab="true">
|
|
|
+ <file leaf-file-name="application-test.properties" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/shop/src/main/resource/application-test.properties">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="255">
|
|
@@ -281,21 +81,41 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/shop/src/main/resource/application.properties">
|
|
|
+ <file leaf-file-name="dev.env.js" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/shop/static/manager/config/dev.env.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="270">
|
|
|
- <caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
|
|
|
+ <state relative-caret-position="0">
|
|
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="prod.env.js" pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/shop/static/manager/config/prod.env.js">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="60">
|
|
|
+ <caret line="4" column="36" lean-forward="false" selection-start-line="4" selection-start-column="36" selection-end-line="4" selection-end-column="36" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/shop/static/manager/config/index.js">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="0">
|
|
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="NewsManager.vue" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/shop/static/manager/src/components/page/NewsManager.vue">
|
|
|
+ <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/shop/src/main/resource/application.properties">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="705">
|
|
|
- <caret line="47" column="40" lean-forward="false" selection-start-line="47" selection-start-column="40" selection-end-line="47" selection-end-column="40" />
|
|
|
+ <state relative-caret-position="270">
|
|
|
+ <caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
@@ -369,7 +189,6 @@
|
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="CHANGED_PATHS">
|
|
|
<list>
|
|
|
- <option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/admin/SysLabelController.java" />
|
|
|
<option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/SysLabelService.java" />
|
|
|
<option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/entry/Equipment.java" />
|
|
|
<option value="$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/bean/EquipmentBean.java" />
|
|
@@ -420,6 +239,7 @@
|
|
|
<option value="$PROJECT_DIR$/shop/static/js/main.js" />
|
|
|
<option value="$PROJECT_DIR$/shop/static/style/main.css" />
|
|
|
<option value="$PROJECT_DIR$/shop/src/main/resource/application-test.properties" />
|
|
|
+ <option value="$PROJECT_DIR$/shop/static/manager/config/prod.env.js" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
@@ -449,7 +269,7 @@
|
|
|
<handled-path value="$PROJECT_DIR$/shop/static/manager/node_modules" />
|
|
|
</component>
|
|
|
<component name="ProjectFrameBounds">
|
|
|
- <option name="x" value="59" />
|
|
|
+ <option name="x" value="449" />
|
|
|
<option name="y" value="23" />
|
|
|
<option name="width" value="1440" />
|
|
|
<option name="height" value="825" />
|
|
@@ -626,6 +446,21 @@
|
|
|
<item name="static" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="js" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
+ <path>
|
|
|
+ <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="tjshop" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="shop" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="static" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="manager" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="tjshop" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="tjshop" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="shop" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="static" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="manager" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="config" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
</expand>
|
|
|
<select />
|
|
|
</subPane>
|
|
@@ -826,12 +661,12 @@
|
|
|
<workItem from="1577168104140" duration="257000" />
|
|
|
<workItem from="1577240993676" duration="26945000" />
|
|
|
<workItem from="1577418968701" duration="6485000" />
|
|
|
- <workItem from="1577706672203" duration="5862000" />
|
|
|
+ <workItem from="1577706672203" duration="5942000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="159564000" />
|
|
|
+ <option name="totallyTimeSpent" value="159644000" />
|
|
|
</component>
|
|
|
<component name="TodoView">
|
|
|
<todo-panel id="selected-file">
|
|
@@ -843,7 +678,8 @@
|
|
|
</todo-panel>
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
- <frame x="59" y="23" width="1440" height="825" extended-state="0" />
|
|
|
+ <frame x="449" y="23" width="1440" height="825" extended-state="0" />
|
|
|
+ <editor active="true" />
|
|
|
<layout>
|
|
|
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.36038515" sideWeight="0.47567955" order="7" side_tool="true" content_ui="tabs" />
|
|
@@ -865,7 +701,7 @@
|
|
|
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.360274" sideWeight="0.5243205" order="2" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15342465" sideWeight="0.49679193" order="7" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29863015" sideWeight="0.49679193" order="7" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22317597" sideWeight="0.48895028" order="0" side_tool="false" content_ui="combo" />
|
|
|
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
|
@@ -899,27 +735,6 @@
|
|
|
</buildFile>
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/shop/src/main/resource/templates/fragments.html.bck">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="405">
|
|
|
- <caret line="27" column="37" lean-forward="false" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="37" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/dao/entry/NewLabel.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="105">
|
|
|
- <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/service/OssService.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="75">
|
|
|
- <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/shop/src/main/java/com/zskk/shop/controller/bean/NewBean.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="277">
|
|
@@ -1316,6 +1131,30 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/shop/static/manager/config/index.js">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="0">
|
|
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/shop/static/manager/config/dev.env.js">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="0">
|
|
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/shop/static/manager/config/prod.env.js">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="60">
|
|
|
+ <caret line="4" column="36" lean-forward="false" selection-start-line="4" selection-start-column="36" selection-end-line="4" selection-end-column="36" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
</component>
|
|
|
<component name="masterDetails">
|
|
|
<states>
|