Commit Graph

928 Commits

Author SHA1 Message Date
wangff
7d810b2a0d fix:新增钱包开通流程及相关接口 2025-11-14 17:02:11 +08:00
wangff
9256332d11 Merge branch 'refs/heads/master' into cc_20251112_wallet
# Conflicts:
#	coolstore-partner-web/src/main/resources/application-ab.properties
#	coolstore-partner-web/src/main/resources/application-test.properties
2025-11-14 13:13:52 +08:00
苏竹红
9f042b9dbd feat:钱包接口对接 2025-11-13 18:44:19 +08:00
wangff
7267868f16 fix:所属大区新增品牌筛选 2025-11-13 11:19:12 +08:00
wangff
13c44053c2 fix:问题修复 2025-11-13 10:40:30 +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
b35903010c fix:十二分制-移动端接口;PC端接口补充 2025-11-11 13:58:24 +08:00
wangff
85de65cda6 fix:十二分制-积分流水 2025-11-10 15:12:19 +08:00
wangff
bd64b33ebb fix:十二分制-申请单 2025-11-10 14:20:44 +08:00
wangff
a3d0f9572c fix:十二分制-奖惩规则 2025-11-07 15:12:25 +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
wangff
85a411bc9a fix:十二分制-奖惩规则 2025-11-05 15:40:31 +08:00
苏竹红
e10525cedd feat:getStoreXinFaDeviceDetail 2025-11-05 10:04:18 +08:00
wangff
75a0ad4676 feat:十二分制-奖惩规则 2025-11-04 17:53:02 +08:00
wangff
867a45f154 feat:字典表 2025-11-04 13:22:49 +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