From 9262bdcf620f195b63599926fac39edbdc315749 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 16 八月 2023 15:00:50 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java
index 536b8a0..ea6ead0 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java
@@ -19,9 +19,9 @@
     private String operatorName;
 
     /**鎿嶄綔澶囨敞*/
-    private Integer operatorRemark;
+    private String operatorRemark;
 
-    /**鏉ユ簮鏍囪瘑-蹇呭~*/
+    /**鏉ユ簮鏍囪瘑*/
     private String commonId;
     /**鏉ユ簮绫诲瀷 CouponReleaseRecordItem*/
     private String commonType;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
index 6dfcd7b..b08eb3c 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java
@@ -15,8 +15,8 @@
     /**鍙戞斁鏁伴噺-蹇呭~*/
     private Integer num;
 
-    /**鐢熸棩鍒镐紶:寮�濮嬫椂闂�,涓嶅~榛樿涓�涓湀*/
+    /**鐢熸棩鍒镐紶:寮�濮嬫椂闂�,骞存湀鏃ユ椂鍒嗙,涓嶅~榛樿涓�涓湀*/
     private String startTime;
-    /**鐢熸棩鍒镐紶:缁撴潫鏃堕棿,涓嶅~榛樿涓�涓湀*/
+    /**鐢熸棩鍒镐紶:缁撴潫鏃堕棿,骞存湀鏃ユ椂鍒嗙,涓嶅~榛樿涓�涓湀*/
     private String endTime;
 }

--
Gitblit v1.8.0