From dd0a3f9a6612d0c419e36260836b87f57a9bd2d3 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期二, 09 八月 2022 17:30:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
index 38bf6c7..5b50ee8 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
@@ -1,14 +1,30 @@
 package com.hz.his.dto.coupon;
 
+
+
 import com.hz.his.dto.PageDto;
 import lombok.Data;
+import java.util.List;
 
 /**
+ * 浼樻儬鍒稿彂閫佸弬鏁�
  * @author fwq
- * 浼樻儬鍒告墿灞�
- * */
+ */
 @Data
 public class CouponDto extends PageDto {
+    /**鏉ユ簮缂栫爜,鍟嗘埛鑷畾涔夋湇鍔℃潵婧愭爣璇�*/
+    private String appIdCode;
+    /**鎿嶄綔浜烘爣璇�*/
+    private String operatorId;
+    /**鎿嶄綔浜哄悕绉�*/
+    private String operatorName;
+    /**鍙戦�佽褰�*/
+    private CouponRecordDto couponReleaseRecordItem;
+    /**鐢ㄦ埛璇︽儏*/
+    private List<UserArrDto> userArr;
+
+
+
     /**淇敼鏃堕棿*/
     private String updateTime;
 

--
Gitblit v1.8.0