Commit Graph

847 Commits

Author SHA1 Message Date
苏竹红
ddaa9bd1fe feat:handleDecorationTeam 2025-11-03 15:33:41 +08:00
苏竹红
c498a017ce Merge branch 'master' into cc_20251028_decoration 2025-10-31 11:10:20 +08:00
苏竹红
45a53a5607 feat:团队 2025-10-31 09:58:04 +08:00
苏竹红
ec73dad33e feat:装修团队配置 2025-10-30 18:34:54 +08:00
苏竹红
d65b528a74 feat:callback 2025-10-30 11:01:08 +08:00
苏竹红
11178ae0e3 feat:callback 2025-10-30 10:50:01 +08:00
苏竹红
ab105dda76 feat:echostr 2025-10-30 10:33:12 +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
苏竹红
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
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
苏竹红
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
wangff
7c44ec246e fix:补充遗失代码 2025-10-22 16:50:31 +08: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
苏竹红
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
苏竹红
47a371cbd7 feat:通知异步发布 2025-10-16 12:05:09 +08: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
苏竹红
28e1b860b1 feat:通知 2025-10-14 17:01:52 +08:00
苏竹红
89a14766ae feat:通知 2025-10-14 15:10:54 +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
苏竹红
6d54e4de9c feat:门店人员更新 2025-09-25 16:57:55 +08:00
wangff
8f7a044d28 fix:STOMP定义心跳0,10000 2025-09-19 14:41:37 +08:00
wangff
ad0b6f0ed9 fix:免登短期token接口;短期token换用户信息接口 2025-09-18 11:13:16 +08:00
wangff
342c91fb89 fix:新增获取接入物联网门店信息开放接口 2025-09-16 10:50:13 +08:00
wangff
190ee8a5c1 fix:平台库配置 2025-09-11 16:06:49 +08:00
wangff
0d42743778 Merge branch 'cc_20250909_new' into cc_20250903_big_screen 2025-09-09 10:46:29 +08:00
wangff
e45b497b3f feat:新增当前用户门店列表 2025-09-09 10:43:05 +08:00
苏竹红
dd2aae3cc8 Merge branch 'master' into cc_20250826_notice
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
2025-09-09 09:46:06 +08:00
wangff
d8cbb78c5d fix:即时通知通过STOMP下发 2025-09-08 14:00:48 +08:00
wangff
514af329ac fix:登录接口返回值修改
feat:新增refresh登录;新增登出接口
2025-09-05 14:53:32 +08:00
wangff
d7b9f20f1f fix:配置 2025-09-04 14:34:25 +08:00
wangff
f4cbe548c7 fix:配置 2025-09-04 14:33:00 +08:00
wangff
5258badf91 fix:动态数据源切面所在目录移动 2025-09-04 14:26:26 +08:00
wangff
435b24be48 fix:新增平台库数据源
feat:新增账密登录接口
2025-09-04 14:19:08 +08:00
苏竹红
f9c2222f10 feat:直营店开店 2025-09-01 16:36:44 +08:00
苏竹红
f90feb407d feat:editMatterConfig 2025-09-01 13:20:39 +08:00
苏竹红
dce1fe5e52 feat:matterType 2025-08-29 13:16:33 +08:00
苏竹红
d5b1960996 feat:通知接口 2025-08-27 11:24:00 +08:00
苏竹红
8219e8b869 Merge branch 'cc_20250813_storeMaster' into 'master'
Cc 20250813 store master

See merge request hangzhou/java/custom_zxjp!154
2025-08-21 09:10:08 +00:00
苏竹红
bc48826339 feat:1 2025-08-21 13:48:44 +08:00
苏竹红
64c6fa229a feat:加盟费处理 2025-08-20 14:37:20 +08:00
苏竹红
d81b4725e0 feat:加盟费处理 2025-08-20 14:32:47 +08:00
苏竹红
d52faf485b feat:主数据同步 2025-08-13 17:23:00 +08:00