王非凡 b4b4d0b988 Merge #11 into master from cc_20251114_minor_req ...

fix:数据看板日营业数据字段修改

* cc_20251114_minor_req: (8 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

  - fix:数据看板日营业数据字段修改

  - fix:根据手机号获取门店列表 开放接口

  - Merge branch 'refs/heads/master' into cc_20251114_minor_req
    
    # Conflicts:
    #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java

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

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/11

2025-12-11 09:09:27 +00:00

..

src/main/java/com/cool/store

Merge #11 into master from cc_20251114_minor_req

2025-12-11 09:09:27 +00:00

pom.xml

feat:通知

2025-10-14 17:01:52 +08:00