From 5041501b2eb692573e4f30e7cc4459149c117da6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 17 Mar 2021 11:50:45 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

---
 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