From f827be041253b7aef34196a432c625b9c4f6cd94 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 11 九月 2025 16:51:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon
---
framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java
index 0ffe52a..c39556f 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java
@@ -187,6 +187,17 @@
private String orderType;
/**
+ * @see CouPonFlagEnum
+ */
+ @ApiModelProperty(value = "鏄惁鏄ぜ鍝佸崱")
+ private String couponFlag;
+ /**
+ * 璁㈠崟鍦板潃淇敼鐘舵��
+ */
+ @ApiModelProperty(value = "璁㈠崟鍦板潃淇敼鐘舵��")
+ private String modifyAddressFlag;
+
+ /**
* @see OrderPromotionTypeEnum
*/
@ApiModelProperty(value = "璁㈠崟淇冮攢绫诲瀷")
--
Gitblit v1.8.0