From 609a1931953b2298016bd2b0d6b410666b5ad7b9 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 02 七月 2026 09:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/3.0.1' into 3.0.1
---
server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 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..d2ced6f 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,13 @@
package com.doumee.dao.business.web.response;
+import com.doumee.dao.business.model.Ad;
+import com.doumee.dao.business.model.Discount;
+import com.doumee.dao.business.model.DiscountMember;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
/**
* Created by IntelliJ IDEA.
@@ -35,16 +39,44 @@
@ApiModelProperty(value = "绉熻祦椤荤煡")
private String leaseNotice;
- @ApiModelProperty(value = "璁′环瑙勫垯")
- private String pricingRules;
+ @ApiModelProperty(value = "鎶奸噾鐘舵�侊細0=鏈敮浠樻娂閲戯紱1=宸叉敮浠樻娂閲�; 2=閫�娆句腑")
+ private Integer depositStatus = 0;
- @ApiModelProperty(value = "鎶奸噾鐘舵�侊細0=鏈敮浠樻娂閲戯紱1=宸叉敮浠樻娂閲戯紱")
- private Integer depositStatus;
+ @ApiModelProperty(value = "璁㈠崟涓婚敭")
+ private String goodsOrderId;
- @ApiModelProperty(value = "楠戣鐘舵�侊細-1=鏈獞琛岋紱0=璇锋眰寮�閿佷腑 ;1=楠戣涓�; 2=宸茶繕杞�; 3=寮�閿佸け璐ワ紱")
+ @ApiModelProperty(value = "楠戣鐘舵�侊細-1=鏈獞琛岋紱0=璇锋眰寮�閿佷腑 ;1=楠戣涓�; 2=宸茶繕杞�; 3=寮�閿佸け璐ワ紱4=涓存椂闅忚溅锛�")
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 String douyinExchangeTips;
@ApiModelProperty(value = "楠戣鎯呭喌")
private MemberRidesResponse memberRidesResponse;
+ @ApiModelProperty(value = "骞垮憡淇℃伅")
+ private List<Ad> adList;
+
+ @ApiModelProperty(value = "鐑攢濂楅")
+ private List<Discount> discountList;
+
+ @ApiModelProperty(value = "鐢佃溅杩愯惀鍖哄煙")
+ private String eleBusinessArea;
+
+ @ApiModelProperty(value = "褰撳墠浼氬憳鏈夋晥濂楅(鏈�澶�10鏉�,鎸夎幏寰楁椂闂村�掑簭)")
+ private List<DiscountMember> validDiscountList;
+
+
}
--
Gitblit v1.9.3