Commit Graph

4341 Commits

Author SHA1 Message Date
wangff
f499d1827b fix:待办缴纳加盟费用列表新增加盟品牌字段 2025-11-17 13:17:23 +08:00
苏竹红
2d6d2693c1 feat:is_delete 2025-11-17 10:43:47 +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
苏竹红
db22e0c0f3 Merge branch 'cc_20251103_open_api' into 'master'
菜品市场门店营收接口新增字段

See merge request hangzhou/java/custom_zxjp!188
2025-11-14 06:28:50 +00:00
苏竹红
dd902f818c Merge branch 'cc_20251114_minor_req' into 'master'
fix:通知模块枚举描述修改

See merge request hangzhou/java/custom_zxjp!189
2025-11-14 06:28:45 +00:00
wangff
7536970ff8 fix:通知模块枚举描述修改 2025-11-14 10:41:45 +08:00
wangff
4cb361a2a4 Merge branch 'master' into cc_20251103_open_api 2025-11-13 13:17:52 +08:00
wangff
77f82cb2a6 fix:菜品市场门店营收接口新增字段 2025-11-13 13:17:38 +08:00
wangff
022169eee1 fix:所属大区新增品牌筛选 2025-11-13 11:33:13 +08: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
苏竹红
0042b2c802 Merge branch 'cc_20251029_smz' into 'master'
三明治

See merge request hangzhou/java/custom_zxjp!186
2025-11-12 09:38:18 +00:00
苏竹红
23efaf8450 feat:10秒 2025-11-12 16:29:57 +08:00
wangff
2e719bd15e fix:修复三明治加盟非加盟合同签约金额错误的问题 2025-11-12 14:17:41 +08:00
苏竹红
368f97774a feat:信发 2025-11-12 13:51:46 +08:00
苏竹红
6cb4086783 feat:证照同步异常处理 2025-11-12 13:19:30 +08:00
wangff
4a08933e36 fix:三明治不初始化营帐通开通阶段 2025-11-11 20:01:55 +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
5af9cb3576 fix 2025-11-11 14:48:25 +08:00
苏竹红
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
苏竹红
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
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
苏竹红
e10525cedd feat:getStoreXinFaDeviceDetail 2025-11-05 10:04:18 +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
苏竹红
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
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