From 446868d70ffeecaeeffb3bed900c0be97ecadbab Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 20 Apr 2022 08:24:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zq-erp/src/main/java/com/matrix/system/hive/vo/DailyBeautyListVo.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/vo/DailyBeautyListVo.java b/zq-erp/src/main/java/com/matrix/system/hive/vo/DailyBeautyListVo.java
index f74f5bc..37a969d 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/vo/DailyBeautyListVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/vo/DailyBeautyListVo.java
@@ -16,6 +16,8 @@
private String vipName;
+ private Long vipId;
+
private int isAppoint;
private String arrivalWay;
@@ -36,9 +38,13 @@
private BigDecimal cardPay;
+ private BigDecimal cashPay;
+
private BigDecimal consume;
private Integer projCnt;
private BigDecimal ticheng;
+
+ private String projInfo;
}
--
Gitblit v1.9.1