From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +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, 4 insertions(+), 0 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 5c8d40d..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,4 +42,8 @@
 
     /**鏄惁鏌ヨ绉垎璁㈠崟*/
     private Integer isIntegral;
+    /**鏄惁鏌ヨ宸插畬鎴愯鍗�*/
+    private Integer isSuc;
+    /**鏄惁鏌ヨ鎷煎洟 0 鍚� 1 鏄�*/
+    private Integer isGroupBuy;
 }

--
Gitblit v1.8.0