From fa6528a77821c3fb7a46c2a8b63a2adb6da4fc10 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 12 九月 2025 15:04:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon

---
 framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleXcxVO.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleXcxVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleXcxVO.java
index 811f3d4..440fc4b 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleXcxVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleXcxVO.java
@@ -27,6 +27,8 @@
 @Data
 public class OrderSimpleXcxVO {
 
+    private String id;
+
     @ApiModelProperty("sn")
     private String sn;
 
@@ -154,6 +156,10 @@
 
     @ApiModelProperty(value = "鍗栧璁㈠崟澶囨敞")
     private String sellerRemark;
+
+    @ApiModelProperty(value = "鏄惁鏄ぜ鍝佸崱")
+    private String couponFlag;
+
     private int i = 0;
     public List<OrderItemVO> initOrderItems() {
         if (CharSequenceUtil.isEmpty(groupGoodsId)) {

--
Gitblit v1.8.0