suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #5 into master from cc_20251114_minor_req

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

* cc_20251114_minor_req: (5 commits squashed)

  - fix:门店日营销数据

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

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

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

  - Merge branch 'master' into cc_20251114_minor_req
    
    # Conflicts:
    #	coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java
    #	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
This commit is contained in:
王非凡
2025-12-04 10:22:48 +00:00
committed by 苏竹红
parent 7b8f220c26
commit c812021fad
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-model/src/main/java/com/cool/store/dto/recipe/RevenueDataDTO.java
View File

@@ -43,5 +43,6 @@ public class RevenueDataDTO {
@ApiModelProperty("下架")
private List<LaunchDataDTO> otherDownDates;
@ApiModelProperty("删除")
private List<LaunchDataDTO> otherDeleteDates;
}

3
coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java
View File

@@ -37,6 +37,9 @@ public class RevenueDataVO {
@ApiModelProperty("下架")
private List<LaunchDataVO> otherDownDates;
@ApiModelProperty("删除")
private List<LaunchDataVO> otherDeleteDates;
@ApiModelProperty("外卖实收")
private BigDecimal takeoutReceivedAmt;