From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突
---
java110-bean/src/main/java/com/java110/vo/api/parkingArea/ApiParkingAreaDataVo.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/vo/api/parkingArea/ApiParkingAreaDataVo.java b/java110-bean/src/main/java/com/java110/vo/api/parkingArea/ApiParkingAreaDataVo.java
index 0a676c6..8606d46 100644
--- a/java110-bean/src/main/java/com/java110/vo/api/parkingArea/ApiParkingAreaDataVo.java
+++ b/java110-bean/src/main/java/com/java110/vo/api/parkingArea/ApiParkingAreaDataVo.java
@@ -1,7 +1,10 @@
package com.java110.vo.api.parkingArea;
+import com.java110.dto.parkingAreaAttr.ParkingAreaAttrDto;
+
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
public class ApiParkingAreaDataVo implements Serializable {
@@ -9,6 +12,7 @@
private String num;
private String typeCd;
private String remark;
+ private List<ParkingAreaAttrDto> attrs;
private String createTime;
@@ -51,4 +55,12 @@
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
+
+ public List<ParkingAreaAttrDto> getAttrs() {
+ return attrs;
+ }
+
+ public void setAttrs(List<ParkingAreaAttrDto> attrs) {
+ this.attrs = attrs;
+ }
}
--
Gitblit v1.8.0