Commit Graph

2983 Commits

Author SHA1 Message Date
苏竹红
3bf7a909a1 Merge remote-tracking branch 'origin/cc_20251112_wallet' into cc_20251112_wallet 2025-11-13 18:44:31 +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
wangff
e6e57d6304 fix:新建shop门店新增storeId,建店携带storeId 2025-11-12 18:39:52 +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
苏竹红
23efaf8450 feat:10秒 2025-11-12 16:29:57 +08:00
wangff
2e719bd15e fix:修复三明治加盟非加盟合同签约金额错误的问题 2025-11-12 14:17:41 +08:00
苏竹红
9d00b92cc5 feat:老店转加盟 2025-11-12 13:29:54 +08:00
wangff
1af57c5871 fix:三明治不初始化营帐通开通阶段 2025-11-11 19:42:44 +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
2dfff50138 fix:推送缴费单数据到新管家新增加盟品牌字段 2025-11-11 15:54:20 +08:00
wangff
18d118d326 fix:三明治铺位审批通过后将详细地址写入门店信息表 2025-11-11 15:20:07 +08:00
wangff
1eb09a9380 fix:推送到新管家参数新增加盟品牌;合计金额计算错误问题修改 2025-11-11 14:59:41 +08:00
wangff
e5acef3899 Merge branch 'master' into cc_20251029_smz 2025-11-11 14:56:27 +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
苏竹红
360328eba8 feat:getShopId 2025-11-10 13:28:19 +08:00
苏竹红
3ebea6476e feat:信发 2025-11-10 13:25:13 +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
a3d0f9572c fix:十二分制-奖惩规则 2025-11-07 15:12:25 +08:00
wangff
67d0b7c726 fix:信发发布新增节目id,接口调用失败情况下抛出异常 2025-11-07 10:15:16 +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
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
苏竹红
d68d24a3e2 Merge branch 'cc_20251031_bugfix' into 'master'
feat:WechatTemplateService

See merge request hangzhou/java/custom_zxjp!180
2025-10-31 09:27:25 +00: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
苏竹红
1e1e0c6eb5 feat:WechatTemplateService 2025-10-31 15:18:26 +08:00
苏竹红
18fb551a72 feat:团队 2025-10-31 15:14:08 +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
wangff
94f4b9741d feat:数据看板 2025-10-30 13:58:58 +08:00
苏竹红
9a02e0ed79 feat:发送模板消息 2025-10-30 11:38:06 +08:00
苏竹红
4f72c20330 feat:发送模板消息 2025-10-30 11:30:48 +08:00
苏竹红
7cdd293952 feat:SPECIAL_DATE_START 2025-10-30 11:22:36 +08:00
苏竹红
3f7157f53d feat:subscribe 2025-10-30 11:09:45 +08:00
苏竹红
1d2a64911b feat:handleEvent 2025-10-30 11:06:03 +08:00