From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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 31d9b99..0dced2a 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
@@ -37,11 +37,12 @@
@ApiModelProperty(value = "绉熻祦椤荤煡")
private String leaseNotice;
- @ApiModelProperty(value = "璁′环瑙勫垯")
- 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;
@@ -49,14 +50,14 @@
@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 businessStartTime;
-
- @ApiModelProperty(value = "灏忕▼搴忚惀涓氱粨鏉熸椂闂寸偣")
- private String businessEndTime;
@ApiModelProperty(value = "楠戣鎯呭喌")
private MemberRidesResponse memberRidesResponse;
--
Gitblit v1.9.3