From 18a9f86a8c1fdb6c42c4212dcaa1de437f6f4861 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 15 十月 2025 14:25:37 +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 440fc4b..2c9941e 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
@@ -160,6 +160,12 @@
@ApiModelProperty(value = "鏄惁鏄ぜ鍝佸崱")
private String couponFlag;
+ /**
+ * @see cn.lili.modules.order.order.entity.enums.CustomizeFlagEnum
+ */
+ @ApiModelProperty(value = "鏄惁鏄畾鍒跺晢鍝�")
+ private String customizeFlag;
+
private int i = 0;
public List<OrderItemVO> initOrderItems() {
if (CharSequenceUtil.isEmpty(groupGoodsId)) {
--
Gitblit v1.8.0