From 3c470b15b952b86c1e38cb9634190a12ccf3d38d Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 22 Jul 2020 15:32:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-demo/kidgrow-demo-order/src/main/resources/application.yml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kidgrow-demo/kidgrow-demo-order/src/main/resources/application.yml b/kidgrow-demo/kidgrow-demo-order/src/main/resources/application.yml
index e27a54f..d0efb31 100644
--- a/kidgrow-demo/kidgrow-demo-order/src/main/resources/application.yml
+++ b/kidgrow-demo/kidgrow-demo-order/src/main/resources/application.yml
@@ -11,7 +11,7 @@
application:
name: demo-order-server
datasource:
- url: jdbc:mysql://${kidgrow.datasource.ip}:3306/demo_order?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
+ url: jdbc:mysql://${kidgrow.datasource.ip}:3306/demo_order?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: ${kidgrow.datasource.username}
password: ${kidgrow.datasource.password}
# driver-class-name: com.mysql.jdbc.Driver
--
Gitblit v1.8.0