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/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