王非凡 c812021fad Merge #5 into master from cc_20251114_minor_req ...

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

2025-12-04 10:22:48 +00:00

..

dto

Merge #5 into master from cc_20251114_minor_req

2025-12-04 10:22:48 +00:00

entity

Merge #4 into master from cc_20251027_new2

2025-12-04 09:48:08 +00:00

request

Merge #3 into master from cc_20251114_minor_req

2025-12-04 09:48:19 +00:00

response

Merge branch 'refs/heads/master' into cc_2021104_twelve_points

2025-12-02 19:34:14 +08:00

userholder

fix:登录接口返回值修改

2025-09-05 14:53:32 +08:00

utils

fix + 枚举，仓库数据等

2025-04-08 16:38:30 +08:00

vo

Merge #5 into master from cc_20251114_minor_req

2025-12-04 10:22:48 +00:00