From 9c977e6d99407f788299084beeebb92a90f59c63 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 21 Apr 2021 15:59:58 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/resources/config/application.properties |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/config/application.properties b/zq-erp/src/main/resources/config/application.properties
index 14fb986..334452c 100644
--- a/zq-erp/src/main/resources/config/application.properties
+++ b/zq-erp/src/main/resources/config/application.properties
@@ -2,6 +2,7 @@
 server.port=8080
 
 
+<<<<<<< HEAD
 #线上测试环境
 
 #spring.datasource.username=ct_test
@@ -16,6 +17,18 @@
 spring.datasource.username=hive
 spring.datasource.password=hive123!@#
 spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+=======
+#spring.datasource.username=hive
+#spring.datasource.password=hive123!@#
+#spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+
+spring.datasource.username=hive
+spring.datasource.password=hive123!@#
+spring.datasource.url=jdbc:mysql://124.70.222.34:3306/hive_prd?useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+
+
+
+>>>>>>> d85af61932a03bd03663daf9da33177af5824a5c
 
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.initialSize=3

--
Gitblit v1.9.1