From 8c469898c0a71224e17780696d47581de47c9ed7 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 23 十月 2024 11:23:36 +0800
Subject: [PATCH] fix: 冲突
---
src/main/java/com/mzl/flower/dto/response/report/OrderReportCalendarBO.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/report/OrderReportCalendarBO.java b/src/main/java/com/mzl/flower/dto/response/report/OrderReportCalendarBO.java
index a59a58d..8b722d1 100644
--- a/src/main/java/com/mzl/flower/dto/response/report/OrderReportCalendarBO.java
+++ b/src/main/java/com/mzl/flower/dto/response/report/OrderReportCalendarBO.java
@@ -3,6 +3,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.time.LocalDate;
import java.time.LocalDateTime;
@Data
@@ -20,5 +21,15 @@
@ApiModelProperty(value = "合伙人id")
private Long partnerId;
+ @ApiModelProperty(value = "是否是合伙人，默认0")
+ private Integer partnerFlag;
+
+
+ @ApiModelProperty("订单的开始日期")
+ private LocalDate paymentDateStart;
+
+ @ApiModelProperty("订单的结束日期")
+ private LocalDate paymentDateEnd;
+
}
--
Gitblit v1.9.3