From 09236e832a65ab4f99e4ca6ecb3ab6022c86ea37 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 08 Mar 2021 12:08:06 +0800
Subject: [PATCH] Merge branch 'api' into hive2.0

---
 zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/jyls.html |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/jyls.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/jyls.html
index 4ab9223..c3b2a39 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/jyls.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/jyls.html
@@ -294,8 +294,10 @@
                     queryKey:_this.form.queryKey,
                     startTime:_this.form.datetimeArr?moment(_this.form.datetimeArr[0]).format("YYYY-MM-DD HH:mm"):'',
                     endTime:_this.form.datetimeArr?moment(_this.form.datetimeArr[1]).format("YYYY-MM-DD HH:mm"):'',
+                    shopId:_this.form.shopId,
                     order:_this.form.order,
                     sort:_this.form.sort,
+
                 }
             },
             search:function(){

--
Gitblit v1.9.1