From 2a3cbabe6a25030d5760cc31d5276042f691d62a Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 12 四月 2024 19:55:09 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java
index 734e310..4c0a590 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponListDto.java
@@ -26,7 +26,7 @@
     private String searchData;
     /**鏀粯鏂瑰紡缂栧彿闆嗗悎*/
     private List<String> payMethodList;
-    /**浼樻儬鍒稿钩鍙�*/
+    /**浼樻儬鍒稿钩鍙�:crm;p-his*/
     private String platform;
 
     /** 璁㈠崟鏍囪瘑List */

--
Gitblit v1.8.0