From 63ba1d6a77860f0c4e6e49a59577a7eb0cfbbe02 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 07 Mar 2022 09:35:37 +0800
Subject: [PATCH] Merge branch 'develop'

---
 zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/jyls.html |    5 +++++
 1 files changed, 5 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 c3b2a39..5ca688e 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
@@ -150,6 +150,11 @@
                     label="支付方式">
             </el-table-column>
             <el-table-column
+                    prop="cardName"
+                    sortable="custom"
+                    label="储值卡名称">
+            </el-table-column>
+            <el-table-column
                     prop="flowNo"
                     label="支付流水号">
             </el-table-column>

--
Gitblit v1.9.1