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 | 8 +++++++-
1 files changed, 7 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 d1a0e73..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
@@ -2,6 +2,7 @@
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;
@@ -44,7 +45,7 @@
@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鏄�")
@@ -59,6 +60,9 @@
@ApiModelProperty(value = "灏忕▼搴忓仠姝㈡湇鍔℃彁绀�")
private String stopServeTips;
+ @ApiModelProperty(value = "鎶栭煶鍒稿厬鎹㈣鏄�")
+ private String douyinExchangeTips;
+
@ApiModelProperty(value = "楠戣鎯呭喌")
private MemberRidesResponse memberRidesResponse;
@@ -71,6 +75,8 @@
@ApiModelProperty(value = "鐢佃溅杩愯惀鍖哄煙")
private String eleBusinessArea;
+ @ApiModelProperty(value = "褰撳墠浼氬憳鏈夋晥濂楅(鏈�澶�10鏉�,鎸夎幏寰楁椂闂村�掑簭)")
+ private List<DiscountMember> validDiscountList;
}
--
Gitblit v1.9.3