From 85d1dc328bd46089b63b57bd356908cbba26e29c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 23 十月 2023 16:45:19 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 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 261dc7e..edd4d5c 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;
 
@@ -27,4 +29,16 @@
     public static String TYPE_COMMON_GROUP_ACTIVITY = "group_activity";
     /**鍏叡鏍囪瘑绫诲瀷,鑰佸甫鏂�*/
     public static String TYPE_COMMON_OLD_NEW = "old_new";
+    /**鍏叡鏍囪瘑绫诲瀷,绀煎搧鍗�*/
+    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";
+    /**鍏叡鏍囪瘑绫诲瀷,鎶藉娲诲姩*/
+    public static final String TYPE_COMMON_DRAW = "draw";
 }

--
Gitblit v1.8.0