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 | 10 ++++++++++
1 files changed, 10 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 edd4d5c..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
@@ -20,6 +20,8 @@
private String commonItemId;
/**鍏叡绫诲瀷*/
private String commonType;
+ /**鏉ユ簮鏍囪瘑*/
+ private String sourceId;
/**鍏叡鏍囪瘑绫诲瀷,鍏呭�艰鍗曟爣璇�*/
public static String TYPE_COMMON_ORDER_RECHARGE = "recharge";
@@ -41,4 +43,12 @@
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