From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 05 八月 2024 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new
---
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