From 4356021b2a307bcf7709d7608115f930ec7cd733 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 21 Aug 2020 19:05:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-jobs/kidgrow-jobs-admin/src/main/resources/application-dev.properties |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kidgrow-jobs/kidgrow-jobs-admin/src/main/resources/application-dev.properties b/kidgrow-jobs/kidgrow-jobs-admin/src/main/resources/application-dev.properties
index 7614e91..61d79d6 100644
--- a/kidgrow-jobs/kidgrow-jobs-admin/src/main/resources/application-dev.properties
+++ b/kidgrow-jobs/kidgrow-jobs-admin/src/main/resources/application-dev.properties
@@ -3,7 +3,7 @@
 kidgrow.datasource.username=root
 kidgrow.datasource.password=root
 
-spring.datasource.url=jdbc:mysql://${kidgrow.datasource.ip}:3306/xxl_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
+spring.datasource.url=jdbc:mysql://${kidgrow.datasource.ip}:3306/xxl_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
 spring.datasource.username=${kidgrow.datasource.username}
 spring.datasource.password=${kidgrow.datasource.password}
 

--
Gitblit v1.8.0