苏竹红
|
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 |
|
苏竹红
|
fce70bec9e
|
feat:callback
|
2025-10-28 13:40:26 +08:00 |
|
苏竹红
|
bf80d825a8
|
feat:回调处理
|
2025-10-28 13:39:23 +08:00 |
|
苏竹红
|
5120b2c48c
|
feat:appid
|
2025-10-28 11:25:43 +08:00 |
|
苏竹红
|
b4365a795c
|
feat:appid
|
2025-10-28 10:02:43 +08:00 |
|
苏竹红
|
5e37edfd98
|
Merge branch 'cc_20251021_join' into 'master'
Cc 20251021 join
See merge request hangzhou/java/custom_zxjp!176
|
2025-10-27 09:06:14 +00:00 |
|
苏竹红
|
f301234f26
|
feat:加盟部只能新建加盟店或者联营店
|
2025-10-27 17:01:35 +08:00 |
|
苏竹红
|
8b4a594d51
|
Merge branch 'cc_20251027_latest_order' into 'master'
门店最近订货时间定时任务
See merge request hangzhou/java/custom_zxjp!175
|
2025-10-27 08:59:01 +00:00 |
|
wangff
|
f784b895cf
|
fix:装修验收回调时覆盖建店资料里的门头照和内景照;建店资料门头照或内景照为空时取装修验收的图;平台账号门头照内景照兼容逗号隔开和json格式
|
2025-10-27 16:46:18 +08:00 |
|
苏竹红
|
80d3f6efd0
|
feat:加盟部只能新建加盟店或者联营店
|
2025-10-27 15:43:21 +08:00 |
|
wangff
|
e74e12fe7c
|
fix:requestId
|
2025-10-27 14:05:50 +08:00 |
|
wangff
|
1830e2240e
|
fix:最新订货时间定时任务过滤门店状态
|
2025-10-27 13:46:48 +08:00 |
|
wangff
|
b2076cc6c5
|
feat:门店最近订货时间定时任务
|
2025-10-27 13:32:23 +08:00 |
|
苏竹红
|
4063cdcfee
|
Merge branch 'cc_20251024_stage_update' into 'master'
POS及营帐通流程修改；新管家数据推送门店名称修改
See merge request hangzhou/java/custom_zxjp!174
|
2025-10-24 08:17:03 +00:00 |
|
wangff
|
0741e41c69
|
fix:信管家数据推送门店名称修改
|
2025-10-24 16:10:10 +08:00 |
|
wangff
|
e1a1cb5616
|
fix:POS开通资料收集中转资料审核中条件修改
|
2025-10-24 14:53:24 +08:00 |
|
wangff
|
e8d0006dcb
|
fix:POS及营帐通开通流程修改
|
2025-10-24 14:08:57 +08:00 |
|
苏竹红
|
000d9e8111
|
Merge branch 'cc_20250903_big_screen' into 'master'
fix:补充遗失代码
See merge request hangzhou/java/custom_zxjp!173
|
2025-10-23 10:31:05 +00:00 |
|
苏竹红
|
17494e9fb4
|
feat:getOldShopCode
|
2025-10-23 18:01:44 +08:00 |
|
wangff
|
7c44ec246e
|
fix:补充遗失代码
|
2025-10-22 16:50:31 +08:00 |
|
苏竹红
|
8cfee17a13
|
Merge branch 'cc_20251016_async' into 'master'
Cc 20251016 async
See merge request hangzhou/java/custom_zxjp!172
|
2025-10-16 09:29:43 +00:00 |
|
苏竹红
|
1203b8acf3
|
Merge branch 'master' into cc_20251016_async
# Conflicts:
# coolstore-partner-common/src/main/java/com/cool/store/executor/MdcTaskExecutor.java
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java
|
2025-10-16 17:29:07 +08:00 |
|
苏竹红
|
7b88d3bec9
|
feat:服务号通知异常处理
|
2025-10-16 16:31:45 +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 |
|
苏竹红
|
f112df17b0
|
feat:通知异步发布
|
2025-10-16 13:14:43 +08:00 |
|
苏竹红
|
47a371cbd7
|
feat:通知异步发布
|
2025-10-16 12:05:09 +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 |
|
苏竹红
|
f92ae8f224
|
Merge branch 'cc_20250903_big_screen' into 'master'
大屏即时通知下发；当前用户门店列表接口
See merge request hangzhou/java/custom_zxjp!171
|
2025-10-15 08:48:48 +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 |
|
苏竹红
|
0545fee340
|
feat:通知配置
|
2025-10-15 11:12:22 +08:00 |
|
苏竹红
|
24b4be799e
|
feat:微信通知改造
|
2025-10-15 10:47:57 +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 |
|
苏竹红
|
b4e88f5424
|
feat:云流水
|
2025-10-13 16:03:32 +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 |
|
苏竹红
|
89e9cf3b57
|
feat:老店新开特殊处理
|
2025-10-10 10:06:11 +08:00 |
|
苏竹红
|
166e5c3d3c
|
Merge branch 'cc_20251008_bigRegion' into 'master'
feat:所属大区
See merge request hangzhou/java/custom_zxjp!167
|
2025-10-08 09:16:13 +00:00 |
|
苏竹红
|
4b9e546ffb
|
feat:所属大区
|
2025-10-08 09:51:00 +08:00 |
|
苏竹红
|
740f365a18
|
Merge branch 'cc_20251005_fuck' into 'master'
feat:大区总
See merge request hangzhou/java/custom_zxjp!166
|
2025-10-05 12:01:10 +00:00 |
|
苏竹红
|
3fbac3c28b
|
feat:大区总
|
2025-10-05 20:00:46 +08:00 |
|
苏竹红
|
e13ffcdb55
|
Merge branch 'cc_20251005_fuck' into 'master'
Cc 20251005 fuck
See merge request hangzhou/java/custom_zxjp!165
|
2025-10-05 08:40:49 +00:00 |
|
苏竹红
|
9217f69237
|
feat:getPOSToken
|
2025-10-05 16:39:56 +08:00 |
|