From a2379bde85121aea8716f709a859f31775e8fd46 Mon Sep 17 00:00:00 2001
From: zhouxiang <zhouxiang>
Date: 星期三, 31 八月 2022 11:36:16 +0800
Subject: [PATCH] Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
index 9723a3f..53ec72a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInfoDto.java
@@ -23,11 +23,11 @@
private String activityId;
/** 娲诲姩瑙勫垯鍚嶇О */
private String activityName;
- /** 鏄惁鏁村崟鎶樻墸 */
+ /** 鏄惁鏁村崟鎶樻墸 蹇呭～锛岄粯璁�0*/
private Integer isWholeDiscount;
- /** 鏄惁鍛樺伐鎶樻墸 */
+ /** 鏄惁鍛樺伐鎶樻墸 蹇呭～锛岄粯璁�0*/
private Integer isEmployeeDiscount;
- /** 鏁村崟鎶樻墸/鍛樺伐鎶樻墸(鍗曚綅:鐧惧垎姣�,榛樿:100) */
+ /** 鏁村崟鎶樻墸/鍛樺伐鎶樻墸(鍗曚綅:鐧惧垎姣�,榛樿:100) 蹇呭～锛岄粯璁�100*/
private BigDecimal discount;
/** 鍒掓墸鐜伴噾鎬婚噾棰�(浣滅敤:鐢ㄦ潵璁＄畻鍒掓墸椤圭洰鐨勬墽琛岄噾棰�,鏀粯鏂瑰紡鏄幇閲戞敮浠樼殑鎬婚噾棰�) */
private BigDecimal snapPayTotal=BigDecimal.ZERO;
--
Gitblit v1.8.0