From 143acd2312a766f39c75b82bce5a32412b863825 Mon Sep 17 00:00:00 2001
From: jiangyouyao <jiangyouyao>
Date: Wed, 06 Apr 2022 14:48:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into develop

---
 zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html
index 021105c..70680aa 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html
@@ -408,6 +408,10 @@
                                 label="支付方式">
                         </el-table-column>
                         <el-table-column
+                                prop="cardName"
+                                label="储值卡名称">
+                        </el-table-column>
+                        <el-table-column
                                 prop="flowNo"
                                 label="流水号">
                         </el-table-column>

--
Gitblit v1.9.1