From 85d1dc328bd46089b63b57bd356908cbba26e29c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 23 十月 2023 16:45:19 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java |    4 +++-
 1 files changed, 3 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..58569fb 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,8 @@
 
     /**鏄惁鏌ヨ绉垎璁㈠崟*/
     private Integer isIntegral;
-    //鏄惁鏌ヨ宸插畬鎴愯鍗�
+    /**鏄惁鏌ヨ宸插畬鎴愯鍗�*/
     private Integer isSuc;
+    /**鏄惁鏌ヨ鎷煎洟 0 鍚� 1 鏄�*/
+    private Integer isGroupBuy;
 }

--
Gitblit v1.8.0