From 87ce5a2c346bfbffa708859ea0cde3fde88854f2 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 14 Apr 2021 20:12:48 +0800
Subject: [PATCH] 合并新版本

---
 zq-erp/src/main/resources/templates/views/super/sysCompany-form.html |    4 ++--
 zq-erp/src/main/resources/config/application.properties              |    9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/zq-erp/src/main/resources/config/application.properties b/zq-erp/src/main/resources/config/application.properties
index 9d8a8ef..14fb986 100644
--- a/zq-erp/src/main/resources/config/application.properties
+++ b/zq-erp/src/main/resources/config/application.properties
@@ -8,11 +8,14 @@
 #spring.datasource.password=123456
 #spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
 
-spring.datasource.username=xc_shop
-spring.datasource.password=xc_shop123!@#
-spring.datasource.url=jdbc:mysql://124.70.222.34/xc_shop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+#spring.datasource.username=xc_shop
+#spring.datasource.password=xc_shop123!@#
+#spring.datasource.url=jdbc:mysql://124.70.222.34/xc_shop?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.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.initialSize=3
diff --git a/zq-erp/src/main/resources/templates/views/super/sysCompany-form.html b/zq-erp/src/main/resources/templates/views/super/sysCompany-form.html
index 0c82ad2..a393e47 100644
--- a/zq-erp/src/main/resources/templates/views/super/sysCompany-form.html
+++ b/zq-erp/src/main/resources/templates/views/super/sysCompany-form.html
@@ -72,8 +72,8 @@
 			<div class="form-group">
 				<label class="col-sm-2 control-label">网站地址</label>
 				<div class="col-sm-4">
-					<input   type="text" dataType="url" class="form-control"
-						ignore="ignore" th:value="${obj.comWebUrl }" name="comWebUrl"
+					<input   type="text" class="form-control"
+						th:value="${obj.comWebUrl }" name="comWebUrl"
 						nullmsg="网站不能为空">
 					<div class="Validform_checktip"></div>
 				</div>

--
Gitblit v1.9.1