From 29d7fca562017456c8316f1ca1a8302303197c11 Mon Sep 17 00:00:00 2001
From: zhouxiang <zhouxiang>
Date: 星期二, 08 十一月 2022 17:03:39 +0800
Subject: [PATCH] Merge branch '禅道号42-his助手要有折扣申请订单,走营销助手审批' into master-test

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

diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java
index e18ddd8..8402cc6 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java
@@ -12,7 +12,7 @@
     /**浼樻儬鍒告爣璇�*/
     private String couponId;
 
-    /**鏍囪瘑鐖舵爣璇嗗瓧绗︿覆閫楀彿鍒嗛殧*/
+    /**鏁伴噺*/
     private Integer num;
 
 }

--
Gitblit v1.8.0