From 155905061b3aa29d2aa23e5693e8704debfb9828 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 06 十一月 2023 16:36:06 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendDto.java |    4 ++++
 1 files changed, 4 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..ede1550 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
@@ -1,5 +1,7 @@
 package com.hz.his.dto.coupon;
 
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
 import lombok.Data;
 
 import java.util.List;
@@ -29,6 +31,8 @@
     private String commonId;
     /**鏉ユ簮绫诲瀷 CouponReleaseRecordItem*/
     private String commonType;
+    /**鏉ユ簮瀛愭爣璇�*/
+    private String commonItemId;
 
     /**鍙戦�佺殑鐢ㄦ埛淇℃伅*/
     private List<CouponSendUserDto> sendUserList;

--
Gitblit v1.8.0