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/order/OrdersPHisTotalDto.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
index 50a7ae6..b64b773 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
@@ -112,4 +112,9 @@
     private String activityPageCode;
     /**娲诲姩鍖哄垎鏍囬*/
     private String activityPageName;
+
+    /** 璁㈠崟鏄惁瑕佽�佸甫鏂拌繑浣�(0鍚�1鏄�) */
+    private Integer isLdxRebate = 1;
+    /** 璁㈠崟鏄惁鑳界敤浼樻儬鍒�(0鍚�1鏄�) */
+    private Integer isCanUseCoupon = 1;
 }

--
Gitblit v1.8.0