From 8f7460c6ddff45ec39bf2026d75a3f4e2b26f13d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 11 Nov 2021 23:01:58 +0800
Subject: [PATCH] fix conflect
---
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-sale-list.html | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-sale-list.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-sale-list.html
index 83c8a58..010a1a8 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-sale-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-sale-list.html
@@ -93,8 +93,6 @@
url : basePath+"/admin/sysBusinessData/findDailySaleData",
showExport : true,
showFooter : false,
- height:'auto',
- width:'auto',
exportDataType : "basic", //basic', 'all', 'selected'.
exportTypes : [ 'excel', 'xlsx' ], //导出类型
exportOptions : {
--
Gitblit v1.9.1