wangff
|
17c3e1cbf3
|
Merge remote-tracking branch 'origin/cc_20251112_wallet' into cc_20251112_wallet
|
2025-11-17 15:52:10 +08:00 |
|
wangff
|
b2bd17e075
|
fix:阶段编码及状态修改
|
2025-11-17 15:51:54 +08:00 |
|
苏竹红
|
04b5a4e7bc
|
feat:打标回调通知接口
|
2025-11-17 14:14:47 +08:00 |
|
wangff
|
fcef86762d
|
fix:打标接口调用新增账户状态校验
|
2025-11-17 11:12:11 +08:00 |
|
wangff
|
35a1e1292a
|
fix:包修改
|
2025-11-17 10:18:32 +08:00 |
|
苏竹红
|
0646022baf
|
feat:钱包接口对接
|
2025-11-15 15:11:14 +08:00 |
|
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 |
|
wangff
|
7536970ff8
|
fix:通知模块枚举描述修改
|
2025-11-14 10:41:45 +08:00 |
|
苏竹红
|
9f042b9dbd
|
feat:钱包接口对接
|
2025-11-13 18:44:19 +08:00 |
|
wangff
|
13c44053c2
|
fix:问题修复
|
2025-11-13 10:40:30 +08:00 |
|
苏竹红
|
c99c4375d7
|
feat:签名
|
2025-11-12 16:27:52 +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
|
9c627dd2dd
|
Merge branch 'master' into cc_20251029_smz
|
2025-11-10 10:42:07 +08:00 |
|
wangff
|
ba2fca738b
|
fix:经营模式新增联营；获取默认值接口返回收银费字段
|
2025-11-10 09:57:53 +08:00 |
|
wangff
|
a3d0f9572c
|
fix:十二分制-奖惩规则
|
2025-11-07 15:12:25 +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 |
|
苏竹红
|
614f42f7ca
|
feat:handleDecorationTeam
|
2025-11-03 15:09:54 +08:00 |
|
wangff
|
22e7aa07e8
|
fix:获取门店信息开放接口新增门店状态字段
|
2025-11-03 14:03:37 +08:00 |
|
苏竹红
|
c498a017ce
|
Merge branch 'master' into cc_20251028_decoration
|
2025-10-31 11:10:20 +08:00 |
|
苏竹红
|
ec73dad33e
|
feat:装修团队配置
|
2025-10-30 18:34:54 +08:00 |
|
wangff
|
94f4b9741d
|
feat:数据看板
|
2025-10-30 13:58:58 +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 |
|
wangff
|
bfdd1dd079
|
fix:新增三明治流程相关字段
|
2025-10-29 19:29:42 +08:00 |
|
苏竹红
|
5120b2c48c
|
feat:appid
|
2025-10-28 11:25:43 +08:00 |
|
苏竹红
|
b4365a795c
|
feat:appid
|
2025-10-28 10:02:43 +08:00 |
|
苏竹红
|
5e37edfd98
|
Merge branch 'cc_20251021_join' into 'master'
Cc 20251021 join
See merge request hangzhou/java/custom_zxjp!176
|
2025-10-27 09:06:14 +00:00 |
|
苏竹红
|
80d3f6efd0
|
feat:加盟部只能新建加盟店或者联营店
|
2025-10-27 15:43:21 +08:00 |
|
wangff
|
b2076cc6c5
|
feat:门店最近订货时间定时任务
|
2025-10-27 13:32:23 +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 |
|
wangff
|
1cb6e26017
|
Merge remote-tracking branch 'origin/master' into cc_20250903_big_screen
# Conflicts:
# coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
|
2025-10-15 11:28:38 +08:00 |
|
苏竹红
|
7752433027
|
feat:微信通知
|
2025-10-13 15:36:42 +08:00 |
|
苏竹红
|
d8b3f89539
|
Merge branch 'cc_20250918_cp_token' into 'master'
fix:菜品市场免登短期token接口；短期token换用户信息接口
See merge request hangzhou/java/custom_zxjp!168
|
2025-10-10 08:21:49 +00:00 |
|
苏竹红
|
c9325fdb00
|
feat:签名
|
2025-09-26 14:56:44 +08:00 |
|
苏竹红
|
6ff4a7811f
|
feat:mq
|
2025-09-25 17:23:41 +08:00 |
|
苏竹红
|
6d54e4de9c
|
feat:门店人员更新
|
2025-09-25 16:57:55 +08:00 |
|
wangff
|
ad0b6f0ed9
|
fix:免登短期token接口；短期token换用户信息接口
|
2025-09-18 11:13:16 +08:00 |
|
苏竹红
|
fe16305910
|
feat:getMessageTemplateCode
|
2025-09-10 19:32:50 +08:00 |
|
苏竹红
|
3ee0ff9fe8
|
feat:DATE_FORMAT_SEC_9
|
2025-09-10 19:22:42 +08:00 |
|
苏竹红
|
220d5f09ea
|
feat:合同推送修改
|
2025-09-10 09:33:00 +08:00 |
|
苏竹红
|
302d38af2b
|
feat:合同配置
|
2025-09-09 11:09:57 +08:00 |
|