From 8fd3db7778b3991810d33ac4dffd2f9031b106fc Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期六, 11 十月 2025 16:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
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