From 8c51032933d201b0c7aedbde0af6e5ff52db329d Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期三, 14 十二月 2022 10:54:03 +0800
Subject: [PATCH] Merge branch 'master-zhangxu' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java |    4 +++-
 1 files changed, 3 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..92423d0 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
@@ -27,6 +27,8 @@
     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";
 }

--
Gitblit v1.8.0