From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 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 55537bf..1698b62 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,4 +16,39 @@
     private String recordName;
     /**鍏叡鏍囪瘑*/
     private String commonId;
+    /**鍏叡瀛愭爣璇�*/
+    private String commonItemId;
+    /**鍏叡绫诲瀷*/
+    private String commonType;
+    /**鏉ユ簮鏍囪瘑*/
+    private String sourceId;
+
+    /**鍏叡鏍囪瘑绫诲瀷,鍏呭�艰鍗曟爣璇�*/
+    public static String TYPE_COMMON_ORDER_RECHARGE = "recharge";
+    /**鍏叡鏍囪瘑绫诲瀷,鏅鸿兘钀ラ攢鎺ㄩ��*/
+    public static String TYPE_COMMON_PUSH_PLAN = "push_plan";
+    /**鍏叡鏍囪瘑绫诲瀷,鍥㈣喘娲诲姩*/
+    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";
+    /**鍏叡鏍囪瘑绫诲瀷,ken娲诲姩棰嗗彇 */
+    public static String TYPE_COMMON_ACTIVITY_KEN = "activity_ken";
+    /**鍏叡鏍囪瘑绫诲瀷,鐖嗘娲诲姩棰嗗彇 */
+    public static String TYPE_COMMON_BURST_ACTIVITY = "burst_activity";
+    /**鍏叡鏍囪瘑绫诲瀷,鐖嗘娲诲姩鍒嗕韩璧犻�� */
+    public static String TYPE_COMMON_BURST_ACTIVITY_SHARE = "burst_activity_share";
+    /**鍏叡鏍囪瘑绫诲瀷,鐖嗘娲诲姩瑙勫垯璧犻�� */
+    public static String TYPE_COMMON_BURST_ACTIVITY_RULE = "burst_activity_rule";
 }

--
Gitblit v1.8.0