Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api

wzy

2021-01-30 5a5e18d266370a7717db57c7275468868f29ed8e

 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>