From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java b/phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java
index 2b28995..cc93828 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java
@@ -2,6 +2,8 @@
import lombok.Data;
+import java.math.BigDecimal;
+
@Data
public class DirectCannelVo {
@@ -11,10 +13,12 @@
private Integer operateType;
/**鎿嶄綔鐤楃▼鏁�*/
private Integer operateNum;
+ /**鎿嶄綔鍒掓墸閲戦*/
+ private BigDecimal deductionTotal;
- /**鎿嶄綔闂ㄥ簵鏍囪瘑*/
+ /**鎿嶄綔闂ㄥ簵鏍囪瘑锛堝簾寮冿級*/
private String shopId;
- /**鎿嶄綔鍛樺伐*/
+ /**鎿嶄綔鍛樺伐锛堝簾寮冿級*/
private String employeeId;
/**鎿嶄綔鍛樺伐瑙掕壊*/
private String employeeRoleId;
--
Gitblit v1.8.0