Commit Graph

4600 Commits

Author SHA1 Message Date
苏竹红
bb1939b42a Merge branch 'cc_20251110_bugfix' into 'master'
Cc 20251110 bugfix

See merge request hangzhou/java/custom_zxjp!185
2025-11-10 08:16:31 +00:00
苏竹红
b51762dc50 feat:服务包专用角色 2025-11-10 15:58:15 +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
zhangchenbiao
2f82e4ac10 Merge branch 'cc_20251104_xinfa' into 'master'
Cc 20251104 xinfa

See merge request hangzhou/java/custom_zxjp!184
2025-11-07 06:48:28 +00:00
wangff
549a4fbd04 fix:补充配置 2025-11-07 14:42:39 +08:00
wangff
8972bd8be0 fix 2025-11-07 14:16:38 +08:00
wangff
10f21f15dc fix:信发设备详情接口及发布接口序列化和反序列化处理 2025-11-07 14:05:52 +08:00
wangff
67d0b7c726 fix:信发发布新增节目id,接口调用失败情况下抛出异常 2025-11-07 10:15:16 +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
苏竹红
c9c8d6d049 feat:request 2025-11-05 10:26:56 +08:00
苏竹红
59519b46fa feat:request 2025-11-05 10:10:18 +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
苏竹红
6d974b60a1 feat:删除团队 2025-11-04 09:28:38 +08:00
苏竹红
6c04721042 Merge branch 'cc_20251103_open_api' into 'master'
fix

See merge request hangzhou/java/custom_zxjp!183
2025-11-03 11:25:11 +00:00
wangff
93be3e24a4 fix 2025-11-03 19:24:12 +08:00
苏竹红
13d7c3930f Merge branch 'cc_20251103_open_api' into 'master'
fix:菜品市场菜品服务包上新接口新增字段

See merge request hangzhou/java/custom_zxjp!182
2025-11-03 10:35:37 +00:00
wangff
3a5ac5cdc4 fix:菜品市场菜品服务包上新接口新增字段 2025-11-03 18:29:14 +08:00
苏竹红
f620f8a751 feat:删除团队 2025-11-03 17:41:44 +08:00
苏竹红
62952e7ba0 Merge branch 'cc_20251103_open_api' into 'master'
fix:获取门店信息开放接口新增门店状态字段

See merge request hangzhou/java/custom_zxjp!181
2025-11-03 09:36:31 +00: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
11b020f2cf feat:Mini数据看板 2025-10-30 14:29:31 +08:00
wangff
f29166f43b fix:去除三明治门店提交总部订货收款账户接口参数校验 2025-10-30 14:13:17 +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