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 'origin/cc_20260408_close_up' into cc_20260408_close_up
- fix:歇业营业发送短信
- fix:排序
- fix:详情接口新增加盟商手机号字段;申请单日期和已有申请单存在交集时申请失败
- fix:申请单详情接口新增品牌字段
- fix:新增列表筛选条件;审批单状态校验
- Merge branch 'master' into cc_20260408_close_up
# Conflicts:
#	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
This commit is contained in:
@@ -92,6 +92,8 @@ xfsg.url=https://inf-test.xianfengsg.com/InfService
|
||||
aliyun.sms.accessKeyId=LTAI5tAVZ3r9UtSpLGcmGoQn
|
||||
aliyun.sms.accessKeySecret=WIMjO4BjVg3YAHwmplq86yOyS2HMpa
|
||||
aliyun.sms.signName=酷店掌
|
||||
aliyun.sms.private.accessKeyId=LTAI5tDp9nFNSca53jjzepE5
|
||||
aliyun.sms.private.accessKeySecret=oTWhLJ6t6DeIINFTkAzwlY18ORfyYl
|
||||
|
||||
mybatis.configuration.variables.enterpriseId=5558ce7a3aa84e3590392fcaa8697ffb
|
||||
enterprise.dingCorpId=dingef2502a50df74ccc35c2f4657eb6378f
|
||||
|
||||
Reference in New Issue
Block a user