From b676adf57558e5b6856bdb7a8d6b7489eca5cdc4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 28 Apr 2021 16:41:26 +0800
Subject: [PATCH] 20210428 抽奖
---
zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw.html | 7 -------
zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw-update.html | 7 -------
zq-erp/src/main/resources/config/test/application.properties | 2 +-
3 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/zq-erp/src/main/resources/config/test/application.properties b/zq-erp/src/main/resources/config/test/application.properties
index cd48b66..cc4b62c 100644
--- a/zq-erp/src/main/resources/config/test/application.properties
+++ b/zq-erp/src/main/resources/config/test/application.properties
@@ -6,7 +6,7 @@
spring.datasource.username=ct_test
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.url=jdbc:mysql://120.27.238.55:3306/hive_test_meidu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
#spring.datasource.username=chuhuan
#spring.datasource.password=chuhuan
diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw-update.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw-update.html
index fb68b57..4c3ec30 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw-update.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw-update.html
@@ -87,13 +87,6 @@
</el-button>
</div>
</el-col>
- <el-col>
- <div style="padding:5px;font-size: 15px;text-align: right;">
- <el-button type="primary" size="mini" round>
- <span>抽奖记录</span>
- </el-button>
- </div>
- </el-col>
</el-row>
<el-row>
diff --git a/zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw.html b/zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw.html
index 3bdea90..b8c948a 100644
--- a/zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw.html
+++ b/zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw.html
@@ -94,13 +94,6 @@
</el-button>
</div>
</el-col>
- <el-col>
- <div style="padding:5px;font-size: 15px;text-align: right;">
- <el-button type="primary" size="mini" round>
- <span>抽奖记录</span>
- </el-button>
- </div>
- </el-col>
</el-row>
<el-row>
--
Gitblit v1.9.1