Go to file

王非凡 4b7a35c96c Merge #18 into master from cc_20251114_minor_req

fix:订货信息新增订货备注并同步主数据；门店编码变更推送新管家

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

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

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

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

  - fix:开店管理修改基本信息资料中门店编码发生变化时推送新管家

  - fix:订货信息新增订货备注并同步主数据

  - Merge branch &#39;refs/heads/master&#39; into cc_20251114_minor_req

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/18

2025-12-26 08:55:27 +00:00

.m2

feta:切换

2025-12-17 14:05:29 +08:00

coolstore-partner-common

Merge #17 into master from cc_20251218_opening

2025-12-25 10:50:38 +00:00

coolstore-partner-dao

Merge #18 into master from cc_20251114_minor_req

2025-12-26 08:55:27 +00:00

coolstore-partner-model

Merge #18 into master from cc_20251114_minor_req