From 1a20adbee4043a7b4a9e51565e7ac0f99d06c36d Mon Sep 17 00:00:00 2001 From: wzy <wzy19931122ai@163.com> Date: Sat, 24 Apr 2021 20:21:24 +0800 Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move --- zq-erp/src/main/resources/config/test/application.properties | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/resources/config/test/application.properties b/zq-erp/src/main/resources/config/test/application.properties index 87fc89f..cd48b66 100644 --- a/zq-erp/src/main/resources/config/test/application.properties +++ b/zq-erp/src/main/resources/config/test/application.properties @@ -30,8 +30,9 @@ spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 spring.thymeleaf.prefix: classpath:/templates/views/ spring.thymeleaf.cache=false -mybatis.config-location=classpath:mybatis/mybatis-config.xml -mybatis.mapper-locations=classpath*:mybatis/mapper/*/*.xml +mybatis-plus.config-location=classpath:mybatis/mybatis-config.xml +mybatis-plus.mapper-locations=classpath*:mybatis/mapper/**/*.xml + #设置全局时间返回格式 第三行设置为true表示返回时间戳 #spring.jackson.date-format=yyyy-MM-dd #spring.jackson.time-zone=GMT+8 @@ -64,7 +65,7 @@ #定时任务 scheduling.enabled=false -swagger.enable=false +swagger.enable=true swagger.security.username=admin swagger.security.password=admin -- Gitblit v1.9.1