From 68434f8f14a02ca70317e9cc2709c0713ef7d1e3 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 26 Jan 2021 16:58:07 +0800
Subject: [PATCH] Merge branch 'api' into hive2.0

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html |    4 ++--
 1 files changed, 2 insertions(+), 2 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 ec5869c..149a1aa 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
@@ -1368,10 +1368,10 @@
             /********** 顶部按钮 start **********/
 
             dateFormat(row, column) {
-                return moment(column.yyTime).format("YYYY-MM-DD HH:mm");
+                return moment(row.yyTime).format("YYYY-MM-DD HH:mm");
             },
             oderTimeFormat(row, column) {
-                return moment(column.orderTime).format("YYYY-MM-DD HH:mm:ss");
+                return moment(row.orderTime).format("YYYY-MM-DD HH:mm:ss");
             },
         }
     });

--
Gitblit v1.9.1