苏竹红
|
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 |
|
苏竹红
|
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
|
7267868f16
|
fix:所属大区新增品牌筛选
|
2025-11-13 11:19:12 +08:00 |
|
苏竹红
|
e092195802
|
Merge branch 'cc_20251110_bugfix' into 'master'
Cc 20251110 bugfix
See merge request hangzhou/java/custom_zxjp!187
|
2025-11-12 09:38:24 +00:00 |
|
wangff
|
2e719bd15e
|
fix:修复三明治加盟非加盟合同签约金额错误的问题
|
2025-11-12 14:17:41 +08:00 |
|
苏竹红
|
368f97774a
|
feat:信发
|
2025-11-12 13:51:46 +08:00 |
|
wangff
|
456e778f1d
|
fix:三明治新管家推送值修改
|
2025-11-11 18:39:37 +08:00 |
|
苏竹红
|
7f342a168d
|
feat:OkHttpClient
|
2025-11-11 18:16:21 +08:00 |
|
wangff
|
549a4fbd04
|
fix:补充配置
|
2025-11-07 14:42:39 +08:00 |
|
苏竹红
|
ebe5f9ac6f
|
feat:信发
|
2025-11-06 11:11:33 +08:00 |
|
苏竹红
|
05210119f1
|
feat:信发
|
2025-11-05 17:56:16 +08:00 |
|
苏竹红
|
2750fffdcd
|
feat:信发
|
2025-11-05 17:51:13 +08:00 |
|
苏竹红
|
f3dc39b911
|
feat:信发
|
2025-11-05 17:47:47 +08:00 |
|
苏竹红
|
e10525cedd
|
feat:getStoreXinFaDeviceDetail
|
2025-11-05 10:04:18 +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 |
|
苏竹红
|
a4764491dc
|
Merge branch 'cc_20251030_fwb' into 'master'
数据看板
See merge request hangzhou/java/custom_zxjp!179
|
2025-10-31 09:26:50 +00: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 |
|
wangff
|
11b020f2cf
|
feat:Mini数据看板
|
2025-10-30 14:29:31 +08:00 |
|
wangff
|
94f4b9741d
|
feat:数据看板
|
2025-10-30 13:58:58 +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 |
|