Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-04-07 21db21a114356e0704a3483c1a3f22b96ea6658b

 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>