From 4607163342d0f3598748662eb3e41cacb708adc6 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 28 二月 2023 11:45:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 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