From a2513c6a269fb14939a8e5d16b8be13f5931bd86 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 23 三月 2023 15:37:13 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/project/DirectCannelVo.java |    6 ++++--
 1 files changed, 4 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..afec6d7 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
@@ -11,10 +11,12 @@
     private Integer operateType;
     /**鎿嶄綔鐤楃▼鏁�*/
     private Integer operateNum;
+    /**鎿嶄綔鍒掓墸閲戦*/
+    private BigDecimal deductionTotal;
 
-    /**鎿嶄綔闂ㄥ簵鏍囪瘑*/
+    /**鎿嶄綔闂ㄥ簵鏍囪瘑锛堝簾寮冿級*/
     private String shopId;
-    /**鎿嶄綔鍛樺伐*/
+    /**鎿嶄綔鍛樺伐锛堝簾寮冿級*/
     private String employeeId;
     /**鎿嶄綔鍛樺伐瑙掕壊*/
     private String employeeRoleId;

--
Gitblit v1.8.0