From 541e9a5eb10f788f1f8067823fa6f71e1b52c31e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 12 十二月 2022 14:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java |   13 +++++++++++++
 1 files changed, 13 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..a2c339b 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,17 @@
     private String recordName;
     /**鍏叡鏍囪瘑*/
     private String commonId;
+    /**鍏叡绫诲瀷*/
+    private String commonType;
+
+    /**鍏叡鏍囪瘑绫诲瀷,鍏呭�艰鍗曟爣璇�*/
+    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";
 }

--
Gitblit v1.8.0