From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +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, 13 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 a2c339b..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,6 +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