Merge remote-tracking branch 'origin/master-base' into master-test

chenjiahe

2024-08-01 e74dade001072c3a0e93cd6d698df4df2262f5a3

 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;
}