From ac61bdd7a7f4834d35bf42a06bc766981f50211e Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 29 Jan 2021 20:27:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0
---
zq-erp/src/main/resources/templates/views/admin/shop/templateMsg-list.html | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/shop/templateMsg-list.html b/zq-erp/src/main/resources/templates/views/admin/shop/templateMsg-list.html
index f3c70ac..6bfb688 100644
--- a/zq-erp/src/main/resources/templates/views/admin/shop/templateMsg-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/shop/templateMsg-list.html
@@ -86,6 +86,7 @@
<th data-field="name">名称</th>
<th data-field="uuid">模板ID</th>
<th data-field="dicMap.status">是否启用</th>
+ <th data-field="dicMap.tempType">模板类型</th>
<th data-field="remark">备注</th>
</tr>
</thead>
--
Gitblit v1.9.1