wangff
|
387e20873e
|
Merge remote-tracking branch 'origin/cc_20251112_wallet' into cc_20251112_wallet
|
2025-11-17 10:06:44 +08:00 |
|
wangff
|
026dab78ff
|
fix
|
2025-11-17 10:06:36 +08:00 |
|
苏竹红
|
aedea2dc59
|
feat:钱包接口对接
|
2025-11-17 09:40:57 +08:00 |
|
苏竹红
|
0646022baf
|
feat:钱包接口对接
|
2025-11-15 15:11:14 +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
|
7d810b2a0d
|
fix:新增钱包开通流程及相关接口
|
2025-11-14 17:02:11 +08: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
|
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 |
|
wangff
|
7536970ff8
|
fix:通知模块枚举描述修改
|
2025-11-14 10:41:45 +08:00 |
|
苏竹红
|
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
|
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 |
|
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 |
|
苏竹红
|
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 |
|
苏竹红
|
c99c4375d7
|
feat:签名
|
2025-11-12 16:27:52 +08:00 |
|
wangff
|
2e719bd15e
|
fix:修复三明治加盟非加盟合同签约金额错误的问题
|
2025-11-12 14:17:41 +08:00 |
|
苏竹红
|
368f97774a
|
feat:信发
|
2025-11-12 13:51:46 +08:00 |
|
苏竹红
|
9d00b92cc5
|
feat:老店转加盟
|
2025-11-12 13:29:54 +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 |
|
wangff
|
b35903010c
|
fix:十二分制-移动端接口；PC端接口补充
|
2025-11-11 13:58:24 +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 |
|
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 |
|