From a18887bf0bae1e775f7e331917449f66519c9a12 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 21 二月 2025 09:02:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 46e45ec..d1a0e73 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,6 +1,7 @@
package com.doumee.dao.business.web.response;
import com.doumee.dao.business.model.Ad;
+import com.doumee.dao.business.model.Discount;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -37,10 +38,7 @@
@ApiModelProperty(value = "绉熻祦椤荤煡")
private String leaseNotice;
- @ApiModelProperty(value = "璁′环瑙勫垯")
- private String pricingRules;
-
- @ApiModelProperty(value = "鎶奸噾鐘舵�侊細0=鏈敮浠樻娂閲戯紱1=宸叉敮浠樻娂閲戯紱")
+ @ApiModelProperty(value = "鎶奸噾鐘舵�侊細0=鏈敮浠樻娂閲戯紱1=宸叉敮浠樻娂閲�; 2=閫�娆句腑")
private Integer depositStatus = 0;
@ApiModelProperty(value = "璁㈠崟涓婚敭")
@@ -67,5 +65,12 @@
@ApiModelProperty(value = "骞垮憡淇℃伅")
private List<Ad> adList;
+ @ApiModelProperty(value = "鐑攢濂楅")
+ private List<Discount> discountList;
+
+ @ApiModelProperty(value = "鐢佃溅杩愯惀鍖哄煙")
+ private String eleBusinessArea;
+
+
}
--
Gitblit v1.9.3