苏竹红
|
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
|
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
|
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 |
|
苏竹红
|
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
|
b35903010c
|
fix:十二分制-移动端接口；PC端接口补充
|
2025-11-11 13:58:24 +08: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 |
|
wangff
|
a3d0f9572c
|
fix:十二分制-奖惩规则
|
2025-11-07 15:12:25 +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 |
|
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 |
|
苏竹红
|
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 |
|
苏竹红
|
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 |
|
苏竹红
|
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 |
|
苏竹红
|
3f23c0ae95
|
feat:装修配置表
|
2025-10-29 19:31:38 +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 |
|
苏竹红
|
f301234f26
|
feat:加盟部只能新建加盟店或者联营店
|
2025-10-27 17:01:35 +08:00 |
|
wangff
|
1830e2240e
|
fix:最新订货时间定时任务过滤门店状态
|
2025-10-27 13:46:48 +08:00 |
|
wangff
|
b2076cc6c5
|
feat:门店最近订货时间定时任务
|
2025-10-27 13:32:23 +08:00 |
|
苏竹红
|
7b88d3bec9
|
feat:服务号通知异常处理
|
2025-10-16 16:31:45 +08:00 |
|
苏竹红
|
1a416ce4b4
|
feat:服务号通知
|
2025-10-16 15:44: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 |
|
苏竹红
|
24b4be799e
|
feat:微信通知改造
|
2025-10-15 10:47:57 +08:00 |
|
苏竹红
|
211fc19499
|
feat:微信通知改造
|
2025-10-14 19:02:09 +08:00 |
|
苏竹红
|
89e9cf3b57
|
feat:老店新开特殊处理
|
2025-10-10 10:06:11 +08:00 |
|
苏竹红
|
4b9e546ffb
|
feat:所属大区
|
2025-10-08 09:51:00 +08:00 |
|
苏竹红
|
3fbac3c28b
|
feat:大区总
|
2025-10-05 20:00:46 +08:00 |
|
苏竹红
|
9217f69237
|
feat:getPOSToken
|
2025-10-05 16:39:56 +08:00 |
|
苏竹红
|
5c353d4de8
|
feat:store_master_signer_info
|
2025-09-24 10:06:15 +08:00 |
|
苏竹红
|
026d5fcdca
|
feat:新增督导查询
|
2025-09-24 09:56:25 +08:00 |
|
wangff
|
eb53fe9d2d
|
Merge branch 'master' into cc_20250905_storeExtendInfo
# Conflicts:
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java
|
2025-09-23 14:11:42 +08:00 |
|
wangff
|
48fe55c8be
|
fix
|
2025-09-23 14:01:48 +08:00 |
|
wangff
|
77cf158d3c
|
fix:获取门店人员信息新增签约人员信息
|
2025-09-23 14:00:01 +08:00 |
|
苏竹红
|
00aee8919d
|
Merge branch 'cc_20250916_new' into 'master'
fix:获取门店信息开放接口新增收货信息字段
See merge request hangzhou/java/custom_zxjp!162
|
2025-09-19 09:10:23 +00:00 |
|
wangff
|
b5984f2e01
|
fix:获取门店信息开放接口新增收货信息字段
|
2025-09-18 14:22:44 +08:00 |
|