~jiangyouyao/beauty-erp.git

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

	zq-erp/src/main/resources/mybatis/mapper/common/SysCompanyDao.xml	3 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-beauty-list.html	20 ●●●●● patch \| view \| raw \| blame \| history

			@@ -761,7 +761,8 @@
			com_logo,
			com_valid,
			com_functions,
			com_plats
			com_plats,
			com_code
			from sys_company
			<where>
			<if test="record!=null">