From 10121f70218d5af50e68f343c18044073bd6d9ce Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 03 七月 2023 17:12:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/phis/dt/reward/RewardRecordDto.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/phis/dt/reward/RewardRecordDto.java b/phis-feign/src/main/java/com/hz/phis/dt/reward/RewardRecordDto.java
index 7f33780..7803dac 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/reward/RewardRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/reward/RewardRecordDto.java
@@ -3,6 +3,8 @@
 import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class RewardRecordDto {
 
@@ -21,4 +23,6 @@
     private String commonId;
 
     private String userId;
+
+    private List<RewardRecordDto> recordDtoList;
 }

--
Gitblit v1.8.0