From bc798685f11aeec95e64c25b0a4594d8876d881d Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 02 八月 2024 14:25:12 +0800
Subject: [PATCH] Merge branch 'master-base' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java | 16 ++++++++++++++++
1 files changed, 16 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 a76c56d..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,8 +16,12 @@
private String recordName;
/**鍏叡鏍囪瘑*/
private String commonId;
+ /**鍏叡瀛愭爣璇�*/
+ private String commonItemId;
/**鍏叡绫诲瀷*/
private String commonType;
+ /**鏉ユ簮鏍囪瘑*/
+ private String sourceId;
/**鍏叡鏍囪瘑绫诲瀷,鍏呭�艰鍗曟爣璇�*/
public static String TYPE_COMMON_ORDER_RECHARGE = "recharge";
@@ -35,4 +39,16 @@
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