From 765007dcc802b0539124cb4c780de665e6665509 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期六, 06 五月 2023 14:56:25 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java |    6 +++++-
 1 files changed, 5 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..b912564 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,10 @@
     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";
 }

--
Gitblit v1.8.0