From 00dc68cd8a661b4795c5775a0c9c2eb3de10c94e Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期五, 01 九月 2023 17:34:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java |    2 ++
 1 files changed, 2 insertions(+), 0 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 db55fe3..6a6b5c5 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
@@ -29,6 +29,8 @@
     private String commonId;
     /**鏉ユ簮绫诲瀷 CouponReleaseRecordItem*/
     private String commonType;
+    /**鏉ユ簮瀛愭爣璇�*/
+    private String commonItemId;
 
     /**鍙戦�佺殑鐢ㄦ埛淇℃伅*/
     private List<CouponSendUserDto> sendUserList;

--
Gitblit v1.8.0