苏竹红
|
97d3e76971
|
Merge branch 'master' into cc_20251028_decoration
# Conflicts:
# coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
|
2025-11-21 16:38:36 +08:00 |
|
wangff
|
f499d1827b
|
fix:待办缴纳加盟费用列表新增加盟品牌字段
|
2025-11-17 13:17:23 +08:00 |
|
苏竹红
|
93f6d93305
|
Merge branch 'cc_20251029_smz' into 'master'
所属大区新增品牌筛选
See merge request hangzhou/java/custom_zxjp!190
|
2025-11-14 10:53:01 +00:00 |
|
wangff
|
4cb361a2a4
|
Merge branch 'master' into cc_20251103_open_api
|
2025-11-13 13:17:52 +08:00 |
|
wangff
|
77f82cb2a6
|
fix:菜品市场门店营收接口新增字段
|
2025-11-13 13:17:38 +08:00 |
|
wangff
|
7267868f16
|
fix:所属大区新增品牌筛选
|
2025-11-13 11:19:12 +08:00 |
|
wangff
|
2e719bd15e
|
fix:修复三明治加盟非加盟合同签约金额错误的问题
|
2025-11-12 14:17:41 +08:00 |
|
wangff
|
456e778f1d
|
fix:三明治新管家推送值修改
|
2025-11-11 18:39:37 +08:00 |
|
wangff
|
2dfff50138
|
fix:推送缴费单数据到新管家新增加盟品牌字段
|
2025-11-11 15:54:20 +08:00 |
|
wangff
|
1eb09a9380
|
fix:推送到新管家参数新增加盟品牌；合计金额计算错误问题修改
|
2025-11-11 14:59:41 +08:00 |
|
wangff
|
5af9cb3576
|
fix
|
2025-11-11 14:48:25 +08:00 |
|
wangff
|
9c627dd2dd
|
Merge branch 'master' into cc_20251029_smz
|
2025-11-10 10:42:07 +08:00 |
|
wangff
|
268665d12e
|
fix:收银费大写字段
|
2025-11-10 10:31:02 +08:00 |
|
wangff
|
ba2fca738b
|
fix:经营模式新增联营；获取默认值接口返回收银费字段
|
2025-11-10 09:57:53 +08:00 |
|
wangff
|
8972bd8be0
|
fix
|
2025-11-07 14:16:38 +08:00 |
|
wangff
|
10f21f15dc
|
fix:信发设备详情接口及发布接口序列化和反序列化处理
|
2025-11-07 14:05:52 +08:00 |
|
wangff
|
67d0b7c726
|
fix:信发发布新增节目id，接口调用失败情况下抛出异常
|
2025-11-07 10:15:16 +08:00 |
|
苏竹红
|
ebe5f9ac6f
|
feat:信发
|
2025-11-06 11:11:33 +08:00 |
|
苏竹红
|
f3dc39b911
|
feat:信发
|
2025-11-05 17:47:47 +08:00 |
|
苏竹红
|
e10525cedd
|
feat:getStoreXinFaDeviceDetail
|
2025-11-05 10:04:18 +08:00 |
|
wangff
|
93be3e24a4
|
fix
|
2025-11-03 19:24:12 +08:00 |
|
wangff
|
3a5ac5cdc4
|
fix:菜品市场菜品服务包上新接口新增字段
|
2025-11-03 18:29:14 +08:00 |
|
苏竹红
|
f620f8a751
|
feat:删除团队
|
2025-11-03 17:41:44 +08:00 |
|
wangff
|
248765a78b
|
fix:菜品市场菜品服务包上新接口
|
2025-11-03 16:37:28 +08:00 |
|
苏竹红
|
0c3e3048ef
|
feat:handleDecorationTeam
|
2025-11-03 16:17:08 +08:00 |
|
苏竹红
|
ddaa9bd1fe
|
feat:handleDecorationTeam
|
2025-11-03 15:33:41 +08:00 |
|
苏竹红
|
614f42f7ca
|
feat:handleDecorationTeam
|
2025-11-03 15:09:54 +08:00 |
|
wangff
|
c0d76eda61
|
fix:获取云流水免登token接口处理不存在老店数据的门店
|
2025-11-03 14:57:13 +08:00 |
|
wangff
|
22e7aa07e8
|
fix:获取门店信息开放接口新增门店状态字段
|
2025-11-03 14:03:37 +08:00 |
|
苏竹红
|
c498a017ce
|
Merge branch 'master' into cc_20251028_decoration
|
2025-10-31 11:10:20 +08:00 |
|
苏竹红
|
ec73dad33e
|
feat:装修团队配置
|
2025-10-30 18:34:54 +08:00 |
|
wangff
|
f29166f43b
|
fix:去除三明治门店提交总部订货收款账户接口参数校验
|
2025-10-30 14:13:17 +08:00 |
|
wangff
|
94f4b9741d
|
feat:数据看板
|
2025-10-30 13:58:58 +08:00 |
|
苏竹红
|
631f2a189a
|
Merge branch 'master' into cc_20251010_wxnotice
# Conflicts:
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java
|
2025-10-29 19:44:14 +08:00 |
|
苏竹红
|
3f23c0ae95
|
feat:装修配置表
|
2025-10-29 19:31:38 +08:00 |
|
wangff
|
bfdd1dd079
|
fix:新增三明治流程相关字段
|
2025-10-29 19:29:42 +08:00 |
|
苏竹红
|
70263034af
|
Merge branch 'cc_20251027_new2' into 'master'
fix:装修验收回调时覆盖建店资料里的门头照和内景照;建店资料门头照或内景照为空时取装修验收的图;平台账号门头照内景照兼容逗号隔开和json格式
See merge request hangzhou/java/custom_zxjp!177
|
2025-10-28 09:16:17 +00:00 |
|
wangff
|
f784b895cf
|
fix:装修验收回调时覆盖建店资料里的门头照和内景照;建店资料门头照或内景照为空时取装修验收的图;平台账号门头照内景照兼容逗号隔开和json格式
|
2025-10-27 16:46:18 +08:00 |
|
wangff
|
b2076cc6c5
|
feat:门店最近订货时间定时任务
|
2025-10-27 13:32:23 +08:00 |
|
苏竹红
|
1a416ce4b4
|
feat:服务号通知
|
2025-10-16 15:44:09 +08:00 |
|
苏竹红
|
7be3958624
|
Merge branch 'cc_20251016_async' into cc_20251010_wxnotice
|
2025-10-16 13:48:22 +08:00 |
|
苏竹红
|
0851b4fbf8
|
Merge branch 'cc_20250916_new' into 'master'
fix:添加门店mq消息新增省市区字段
See merge request hangzhou/java/custom_zxjp!170
|
2025-10-15 08:48:55 +00:00 |
|
wangff
|
1cb6e26017
|
Merge remote-tracking branch 'origin/master' into cc_20250903_big_screen
# Conflicts:
# coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
|
2025-10-15 11:28:38 +08:00 |
|
苏竹红
|
ba6835a887
|
feat:微信通知改造
|
2025-10-15 10:32:48 +08:00 |
|
苏竹红
|
211fc19499
|
feat:微信通知改造
|
2025-10-14 19:02:09 +08:00 |
|
苏竹红
|
28e1b860b1
|
feat:通知
|
2025-10-14 17:01:52 +08:00 |
|
苏竹红
|
89a14766ae
|
feat:通知
|
2025-10-14 15:10:54 +08:00 |
|
wangff
|
2a8abd0b3e
|
fix:添加门店mq消息新增省市区字段
|
2025-10-14 11:00:19 +08:00 |
|
苏竹红
|
7752433027
|
feat:微信通知
|
2025-10-13 15:36:42 +08:00 |
|
苏竹红
|
d8b3f89539
|
Merge branch 'cc_20250918_cp_token' into 'master'
fix:菜品市场免登短期token接口；短期token换用户信息接口
See merge request hangzhou/java/custom_zxjp!168
|
2025-10-10 08:21:49 +00:00 |
|