From e4538a591ef58e33984e9e8209833d1243719e2e Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期三, 02 八月 2023 11:57:04 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into fhx-prod-热门活动

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
index b912564..82af4b1 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
@@ -16,6 +16,8 @@
     private String recordName;
     /**鍏叡鏍囪瘑*/
     private String commonId;
+    /**鍏叡瀛愭爣璇�*/
+    private String commonItemId;
     /**鍏叡绫诲瀷*/
     private String commonType;
 
@@ -31,6 +33,10 @@
     public static String TYPE_COMMON_GIFT = "gift";
     /**鍏叡鏍囪瘑绫诲瀷,钀ラ攢浼樻儬鍒�*/
     public static String TYPE_COMMON_MARKE = "marketing";
-    //涓夊叓濡囧コ鑺傞鍙栦紭鎯犲埜
+    /**鍏叡鏍囪瘑绫诲瀷,涓夊叓濡囧コ鑺傞鍙栦紭鎯犲埜*/
     public static final String TYPE_COMMON_QUEEN_DAY = "queen_day";
+    /**鍏叡鏍囪瘑绫诲瀷,crm鍟嗗搧璇︽儏棰嗗彇浼樻儬鍒�*/
+    public static final String TYPE_COMMON_GOODS_DETAILS = "goods_details";
+    /**鍏叡鏍囪瘑绫诲瀷,璁㈠崟璐拱浼樻儬鍒�*/
+    public static final String TYPE_COMMON_ORDER = "order";
 }

--
Gitblit v1.8.0