From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw-update.html | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
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>
--
Gitblit v1.9.1