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 ++--
 1 files changed, 2 insertions(+), 2 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;

--
Gitblit v1.8.0