From 8243c06e629d79bba0388e6fb4f0e1ae70281ded Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 25 Mar 2022 12:30:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/订单服务单代码改造' into feature/订单服务单代码改造

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

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html
index cd96811..ace7138 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html
@@ -257,6 +257,10 @@
                                         prop="failTime"
                                         label="到期时间">
                                 </el-table-column>
+                                <el-table-column
+                                        prop="createTime"
+                                        label="创建时间">
+                                </el-table-column>
                                 <el-table-column label="操作">
                                     <template slot-scope="scope">
                                         <el-button matrix:btn="vipinfoClub-youxiao" v-if="scope.row.status!='有效'" type="text" size="small" @click="tabProjValid(scope.$index, scope.row)">有效</el-button>
@@ -300,6 +304,11 @@
                                 <el-table-column
                                         prop="failTime"
                                         label="到期时间">
+                                </el-table-column>
+
+                                <el-table-column
+                                        prop="createTime"
+                                        label="创建时间">
                                 </el-table-column>
                                 <el-table-column label="操作" fixed="right" width="160">
                                     <template slot-scope="scope">
@@ -356,6 +365,10 @@
                                         label="到期时间" width="160">
                                 </el-table-column>
                                 <el-table-column
+                                        prop="createTime"
+                                        label="创建时间">
+                                </el-table-column>
+                                <el-table-column
                                         prop="remark"
                                         label="备注">
                                 </el-table-column>

--
Gitblit v1.9.1