From f55b38102c99878a0eb9a829ee9cf3bc8a76de01 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十月 2023 18:16:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev

---
 server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java b/server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java
index bd03383..46e45ec 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java
@@ -1,9 +1,11 @@
 package com.doumee.dao.business.web.response;
 
+import com.doumee.dao.business.model.Ad;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * Created by IntelliJ IDEA.
@@ -39,12 +41,31 @@
     private String pricingRules;
 
     @ApiModelProperty(value = "鎶奸噾鐘舵�侊細0=鏈敮浠樻娂閲戯紱1=宸叉敮浠樻娂閲戯紱")
-    private Integer depositStatus;
+    private Integer depositStatus = 0;
+
+    @ApiModelProperty(value = "璁㈠崟涓婚敭")
+    private String goodsOrderId;
 
     @ApiModelProperty(value = "楠戣鐘舵�侊細-1=鏈獞琛岋紱0=璇锋眰寮�閿佷腑 ;1=楠戣涓�; 2=宸茶繕杞�;  3=寮�閿佸け璐ワ紱")
     private Integer rideStatus;
 
+    @ApiModelProperty(value = "灏忕▼搴忔槸鍚﹀仠姝㈡湇鍔� 0鍚� 1鏄�")
+    private Integer isStopServe;
+
+    @ApiModelProperty(value = "灏忕▼搴忔槸鍚﹁惀涓� 0鍚� 1鏄�")
+    private Integer isBusiness;
+
+    @ApiModelProperty(value = "鏈紑濮嬭惀涓氭彁绀鸿")
+    private String unBusinessTips;
+
+    @ApiModelProperty(value = "灏忕▼搴忓仠姝㈡湇鍔℃彁绀�")
+    private String stopServeTips;
+
     @ApiModelProperty(value = "楠戣鎯呭喌")
     private MemberRidesResponse memberRidesResponse;
 
+    @ApiModelProperty(value = "骞垮憡淇℃伅")
+    private List<Ad> adList;
+
+
 }

--
Gitblit v1.9.3