From 53e83fe43dae6e7f4b7fea91ebe2baa6b871dadd Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 11 Nov 2021 23:42:52 +0800
Subject: [PATCH] Merge branch 'ty_fix' into score_shop

---
 zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-beauty-list.html |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-beauty-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-beauty-list.html
index 69f99f8..809c75c 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-beauty-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-beauty-list.html
@@ -2,15 +2,15 @@
 <!DOCTYPE HTML>
 <html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
 <head>
-<meta charset="utf-8">
-<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
-<meta name="renderer" content="webkit|ie-comp|ie-stand">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-<meta name="viewport"
-	content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
-<meta http-equiv="Cache-Control" content="no-siteapp" />
-<LINK rel="Bookmark" href="../images/favicon.ico">
-<!-- 本框架基本脚本和样式 -->
+	<meta charset="utf-8">
+	<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
+	<meta name="renderer" content="webkit|ie-comp|ie-stand">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+	<meta name="viewport"
+		  content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+	<meta http-equiv="Cache-Control" content="no-siteapp" />
+	<LINK rel="Bookmark" href="../images/favicon.ico">
+	<!-- 本框架基本脚本和样式 -->
 	<script type="text/javascript" th:src="@{/js/systools/MBaseVue.js}"></script>
 	<script type="text/javascript" th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
 	<script type="text/javascript" th:src="@{/js/plugin/jquery.query.js}"></script>
@@ -68,7 +68,7 @@
 			</el-form-item>
 			<el-button type="primary" @click="search" >搜索</el-button>
 			<el-button @click="resetForm('form')">重置</el-button>
-<!--			<el-button type="warning" @click="exportExcel">导出</el-button>-->
+			<!--			<el-button type="warning" @click="exportExcel">导出</el-button>-->
 		</el-form>
 	</el-row>
 	<el-row class="table-style">

--
Gitblit v1.9.1