From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java
index 190dc23..b5ef7ad 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java
@@ -42,6 +42,13 @@
 
     /**鏄惁鏌ヨ绉垎璁㈠崟*/
     private Integer isIntegral;
-    //鏄惁鏌ヨ宸插畬鎴愯鍗�
+    /**鏄惁鏌ヨ宸插畬鎴愯鍗�*/
     private Integer isSuc;
+    /**鏄惁鏌ヨ鎷煎洟 0 鍚� 1 鏄�*/
+    private Integer isGroupBuy;
+
+    /**鏄惁杩囨护宸查��娆剧殑鍗� 0 鍚� 1 鏄�*/
+    private Integer isRefund;
+    /** 鏄惁鍓旈櫎鍗″寘璁㈠崟 */
+    private Integer isNotCardBag;
 }

--
Gitblit v1.8.0