From 5100e0fe44f260d81b7416d0de46962926709cab Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 12 九月 2025 09:33:18 +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 |    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