From b8e7bb1791ff41be5ee8150cc46af082d7444a65 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 31 五月 2023 01:02:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java |   38 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 37 insertions(+), 1 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java b/java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java
index 2ab8cad..a60cfa8 100755
--- a/java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java
@@ -1,7 +1,6 @@
 package com.java110.dto.owner;
 
 import com.java110.dto.PageDto;
-import com.java110.dto.ownerCarAttr.OwnerCarAttrDto;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -70,6 +69,8 @@
     private Date endTime;
     private String state;
     private String stateName;
+    private String iotStateName;
+    private String iotRemark;
 
     private String areaNum;
 
@@ -99,6 +100,9 @@
 
     private String memberCarCount;
 
+    private String userName;
+
+    private String operate;
     private List<OwnerCarAttrDto> ownerCarAttrDto;
 
     public String getCarColor() {
@@ -500,4 +504,36 @@
     public void setMemberCarNumLike(String memberCarNumLike) {
         this.memberCarNumLike = memberCarNumLike;
     }
+
+    public String getIotStateName() {
+        return iotStateName;
+    }
+
+    public void setIotStateName(String iotStateName) {
+        this.iotStateName = iotStateName;
+    }
+
+    public String getIotRemark() {
+        return iotRemark;
+    }
+
+    public void setIotRemark(String iotRemark) {
+        this.iotRemark = iotRemark;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getOperate() {
+        return operate;
+    }
+
+    public void setOperate(String operate) {
+        this.operate = operate;
+    }
 }

--
Gitblit v1.8.0