Commit Graph

1405 Commits

Author SHA1 Message Date
苏竹红
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
苏竹红
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
苏竹红
c4848695fa Merge branch 'cc_20250911_mini_jump' into 'master'
Cc 20250911 mini jump

See merge request hangzhou/java/custom_zxjp!161
2025-09-17 09:56:08 +00:00
wangff
342c91fb89 fix:新增获取接入物联网门店信息开放接口 2025-09-16 10:50:13 +08:00
苏竹红
5c0bf74249 feat:listByMobile 改造 2025-09-12 10:50:08 +08:00
苏竹红
f0bd951611 feat:第三方id 2025-09-11 14:51:14 +08:00
wangff
733caec6a0 fix:即时通知消息新增后获取id 2025-09-11 10:37:01 +08:00
wangff
0d42743778 Merge branch 'cc_20250909_new' into cc_20250903_big_screen 2025-09-09 10:46:29 +08:00
苏竹红
dd2aae3cc8 Merge branch 'master' into cc_20250826_notice
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
2025-09-09 09:46:06 +08:00
wangff
eacc3c6f8d Merge branch 'refs/heads/cc_20250826_notice' into cc_20250903_big_screen 2025-09-08 10:46:14 +08:00
苏竹红
910efd055d feat:getStoreListByMobile 2025-09-05 15:51:21 +08:00
苏竹红
339f42ab06 feat:跳转链接 2025-09-05 13:39:29 +08:00
wangff
435b24be48 fix:新增平台库数据源
feat:新增账密登录接口
2025-09-04 14:19:08 +08:00
苏竹红
dc5e05f49f feat:获取用户只有督导用户 2025-09-03 18:44:19 +08:00
苏竹红
a11e150630 feat:获取用户只有督导用户 2025-09-03 17:15:45 +08:00
苏竹红
5f7109e48b feat:菜品市场门店接口 2025-09-02 10:30:52 +08:00
苏竹红
9af2de1023 feat:handlePersonInfo 2025-08-29 15:07:10 +08:00
苏竹红
dce1fe5e52 feat:matterType 2025-08-29 13:16:33 +08:00
苏竹红
f6b695bf69 feat:matterType 2025-08-28 17:38:06 +08:00
苏竹红
5debcb3147 feat:跳转 2025-08-27 14:45:29 +08:00
苏竹红
d5b1960996 feat:通知接口 2025-08-27 11:24:00 +08:00
苏竹红
8219e8b869 Merge branch 'cc_20250813_storeMaster' into 'master'
Cc 20250813 store master

See merge request hangzhou/java/custom_zxjp!154
2025-08-21 09:10:08 +00:00
苏竹红
773230dabf feat:加盟费处理 2025-08-20 14:25:57 +08:00
苏竹红
6aafc3970f feat:主数据同步 2025-08-18 09:29:44 +08:00
shuo.wang
3951189e7a fix updateByPrimaryKeySelective 2025-08-14 12:30:13 +08:00
shuo.wang
3f33ed21cb Merge branch 'master' into cc_20250723_Decoration
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
2025-08-07 18:03:44 +08:00
shuo.wang
31758c4e60 待办装修调整 2025-08-07 14:06:39 +08:00
shuo.wang
518144c329 待办装修调整 2025-08-07 13:49:49 +08:00