From 561aa63737f42136c69e87a8d907727da235b38c Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 16 八月 2024 18:51:41 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceFundVO.java | 28 +++++++---------------------
1 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceFundVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceFundVO.java
index 9ade521..93642ea 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceFundVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceFundVO.java
@@ -1,26 +1,12 @@
package com.ruoyi.project.domain.vo;
-import java.util.Date;
import java.util.List;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.project.domain.ServiceFund;
import com.ruoyi.project.domain.ServiceFunddetail;
-import com.ruoyi.project.domain.ServiceFundflow;
+import com.ruoyi.project.domain.ServiceFunddetailVO;
import io.swagger.annotations.ApiModel;
import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
-import com.ruoyi.common.annotation.Excel.Type;
-import com.ruoyi.common.annotation.Excels;
-import com.ruoyi.common.core.domain.BaseEntity;
/**
* 璐圭敤姹囨�诲疄浣撶被
@@ -29,13 +15,13 @@
*/
@Data
@ApiModel("璐圭敤姹囨�诲疄浣撶被")
-public class ServiceFundVO extends ServiceFund
-{
- /** 璐圭敤鏄庣粏 */
- private List<ServiceFunddetail> serviceFunddetails;
+public class ServiceFundVO extends ServiceFund {
+ /**
+ * 璐圭敤鏄庣粏
+ */
+ private List<ServiceFunddetailVO> serviceFunddetails;
- public List<ServiceFunddetail> getServiceFunddetails()
- {
+ public List<ServiceFunddetailVO> getServiceFunddetails() {
return serviceFunddetails;
}
}
--
Gitblit v1.9.3