From 10121f70218d5af50e68f343c18044073bd6d9ce Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 03 七月 2023 17:12:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java | 8 ++++++++
1 files changed, 8 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 92423d0..82af4b1 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;
@@ -31,4 +33,10 @@
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";
}
--
Gitblit v1.8.0