From 4d4805096b898a6e99f31794facb81794bd1fcf7 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 25 Jan 2021 09:39:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0

---
 zq-erp/src/main/resources/templates/views/admin/shop/templateMsg-form.html |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/shop/templateMsg-form.html b/zq-erp/src/main/resources/templates/views/admin/shop/templateMsg-form.html
index a48b207..27a2914 100644
--- a/zq-erp/src/main/resources/templates/views/admin/shop/templateMsg-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/shop/templateMsg-form.html
@@ -36,6 +36,19 @@
 					   th:value="${obj.uuid}"nullmsg="模板id不能为空">
 			</div>
 		</div>
+			<div class="form-group">
+				<label class="col-sm-2 control-label">类型
+					<span class="text-danger">*</span>
+				</label>
+				<div class="col-sm-4">
+					<select class="form-control" dataType="*" nullmsg="请选择状态" name="tempType">
+						<option value='1' th:if="${obj.tempType == 1}" selected>公众号</option>
+						<option value='1' th:unless="${obj.tempType == 1}">公众号</option>
+						<option value='2' th:if="${obj.tempType == 2}" selected>小程序</option>
+						<option value='2' th:unless="${obj.tempType == 2}">小程序</option>
+					</select>
+				</div>
+			</div>
 
 		<div class="form-group">
 

--
Gitblit v1.9.1