From 4f683b09b583ea488c08d30da885e421b691723e Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 19 十月 2023 16:45:45 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java | 4 +++-
phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java | 2 ++
2 files changed, 5 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;
}
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 bee390c..c789dff 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
@@ -101,4 +101,6 @@
private String treatSingleId;
/** 鍒涘缓鏂瑰紡锛圤rderTotalConstants锛� */
private String addWay;
+ /**鏄惁鎷煎洟 0 鍚� 1 鏄�*/
+ private Integer isGroupBuy;
}
--
Gitblit v1.8.0