From f3ccf81a4f203dd0d8957bab15c491cb2181e071 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 30 九月 2025 19:21:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java | 6 ++++++
1 files changed, 6 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 a9636fb..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
@@ -185,6 +185,12 @@
*/
@ApiModelProperty(value = "璁㈠崟绫诲瀷")
private String orderType;
+
+ /**
+ * @see CouPonFlagEnum
+ */
+ @ApiModelProperty(value = "鏄惁鏄ぜ鍝佸崱")
+ private String couponFlag;
/**
* 璁㈠崟鍦板潃淇敼鐘舵��
*/
--
Gitblit v1.8.0