From c812021fade1e5eb2f35de380123dd00e3f3667b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?=
 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Date: Thu, 4 Dec 2025 10:22:48 +0000
Subject: [PATCH] Merge #5 into master from cc_20251114_minor_req
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix:菜品市场数据新增字段

* cc_20251114_minor_req: (5 commits squashed)

  - fix:门店日营销数据

  - fix:jackson反序列化配置忽略未定义字段

  - fix:菜品市场数据新增字段

  - fix:菜品市场数据新增字段

  - Merge branch &#39;master&#39; into cc_20251114_minor_req

    # Conflicts:
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java
    #&#9;coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-by: 苏竹红 <accounts_68551bf01395375227aee211@mail.teambition.com>
Merged-by: 苏竹红 <accounts_68551bf01395375227aee211@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/5
---
 .../main/java/com/cool/store/dto/recipe/RevenueDataDTO.java    | 3 ++-
 .../src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java  | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java
index f2e16e2f3..7852f4eca 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java
@@ -43,5 +43,6 @@ public class RevenueDataDTO {
     @ApiModelProperty("下架")
     private List<LaunchDataDTO> otherDownDates;
 
-
+    @ApiModelProperty("删除")
+    private List<LaunchDataDTO> otherDeleteDates;
 }
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java
index 39ad7fbe1..5c623cbce 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java
@@ -37,6 +37,9 @@ public class RevenueDataVO {
     @ApiModelProperty("下架")
     private List<LaunchDataVO> otherDownDates;
 
+    @ApiModelProperty("删除")
+    private List<LaunchDataVO> otherDeleteDates;
+
     @ApiModelProperty("外卖实收")
     private BigDecimal takeoutReceivedAmt;