Go to file

王非凡 19bce915ac Merge #99 into master from cc_20260408_close_up

feat:歇业管理

* cc_20260408_close_up: (18 commits squashed)

  - fix:歇业管理（部分）

  - fix:歇业管理（部分）

  - fix:审批逻辑修改；拒绝审批实现

  - fix:恢复开业申请及审批

  - fix:主流程补充

  - fix:主流程补充

  - fix:字段补充及逻辑修改

  - fix:字段补充

  - fix

  - fix:平台处理新增字段

  - fix

  - Merge remote-tracking branch &#39;origin/cc_20260408_close_up&#39; into cc_20260408_close_up

  - fix:歇业营业发送短信

  - fix:排序

  - fix:详情接口新增加盟商手机号字段；申请单日期和已有申请单存在交集时申请失败

  - fix:申请单详情接口新增品牌字段

  - fix:新增列表筛选条件；审批单状态校验

  - Merge branch &#39;master&#39; into cc_20260408_close_up
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

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

2026-04-15 08:23:40 +00:00

.m2

feta:切换

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

coolstore-partner-common

Merge #99 into master from cc_20260408_close_up

2026-04-15 08:23:40 +00:00

coolstore-partner-dao

Merge #99 into master from cc_20260408_close_up

2026-04-15 08:23:40 +00:00

coolstore-partner-model

Merge #99 into master from cc_20260408_close_up