From a4d937e5e739d50b304a144da4c3317146b055d9 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 22 五月 2023 15:02:55 +0800
Subject: [PATCH] Merge branch 'master' 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 68d583e..8390d10 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
@@ -22,7 +22,7 @@
     private Integer isBirthday;
     /**鏄惁绾夸笅鍒�*/
     private Integer isOffline = 0;
-    /**浼樻儬鍒哥爜*/
+    /**鎼滅储,绾夸笅浼樻儬鍒哥爜/绾夸笂鍚嶇О*/
     private String searchData;
     /**鏀粯鏂瑰紡缂栧彿闆嗗悎*/
     private List<String> payMethodList;

--
Gitblit v1.8.0