Commit Graph

1317 Commits

Author SHA1 Message Date
苏竹红
0c3e3048ef feat:handleDecorationTeam 2025-11-03 16:17:08 +08:00
苏竹红
ddaa9bd1fe feat:handleDecorationTeam 2025-11-03 15:33:41 +08:00
苏竹红
614f42f7ca feat:handleDecorationTeam 2025-11-03 15:09:54 +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
苏竹红
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
苏竹红
70263034af Merge branch 'cc_20251027_new2' into 'master'
fix:装修验收回调时覆盖建店资料里的门头照和内景照;建店资料门头照或内景照为空时取装修验收的图;平台账号门头照内景照兼容逗号隔开和json格式

See merge request hangzhou/java/custom_zxjp!177
2025-10-28 09:16:17 +00:00
wangff
f784b895cf fix:装修验收回调时覆盖建店资料里的门头照和内景照;建店资料门头照或内景照为空时取装修验收的图;平台账号门头照内景照兼容逗号隔开和json格式 2025-10-27 16:46:18 +08:00
wangff
b2076cc6c5 feat:门店最近订货时间定时任务 2025-10-27 13:32:23 +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
苏竹红
0851b4fbf8 Merge branch 'cc_20250916_new' into 'master'
fix:添加门店mq消息新增省市区字段

See merge request hangzhou/java/custom_zxjp!170
2025-10-15 08:48:55 +00: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
苏竹红
ba6835a887 feat:微信通知改造 2025-10-15 10:32:48 +08:00
苏竹红
211fc19499 feat:微信通知改造 2025-10-14 19:02:09 +08:00
苏竹红
28e1b860b1 feat:通知 2025-10-14 17:01:52 +08:00
苏竹红
89a14766ae feat:通知 2025-10-14 15:10:54 +08:00
wangff
2a8abd0b3e fix:添加门店mq消息新增省市区字段 2025-10-14 11:00:19 +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
苏竹红
4b9e546ffb feat:所属大区 2025-10-08 09:51:00 +08:00
苏竹红
6d54e4de9c feat:门店人员更新 2025-09-25 16:57:55 +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
wangff
ad0b6f0ed9 fix:免登短期token接口;短期token换用户信息接口 2025-09-18 11:13:16 +08:00
苏竹红
c68ae7a701 Merge branch 'cc_20250916_buildstore' into 'master'
Cc 20250916 buildstore

See merge request hangzhou/java/custom_zxjp!160
2025-09-17 09:56:15 +00: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
苏竹红
4251b69eab feat:新建店添加合同编码字段 2025-09-16 11:14:54 +08:00
wangff
342c91fb89 fix:新增获取接入物联网门店信息开放接口 2025-09-16 10:50:13 +08:00
苏竹红
f0bd951611 feat:第三方id 2025-09-11 14:51:14 +08:00
苏竹红
34ed5679e6 feat:第三方id 2025-09-11 09:32:59 +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
d8cbb78c5d fix:即时通知通过STOMP下发 2025-09-08 14:00:48 +08:00
wangff
eacc3c6f8d Merge branch 'refs/heads/cc_20250826_notice' into cc_20250903_big_screen 2025-09-08 10:46:14 +08:00
苏竹红
36ed7cdb8f feat:跳转链接 2025-09-05 14:53:37 +08:00
wangff
514af329ac fix:登录接口返回值修改
feat:新增refresh登录;新增登出接口
2025-09-05 14:53:32 +08:00
苏竹红
339f42ab06 feat:跳转链接 2025-09-05 13:39:29 +08:00
苏竹红
2facd1f906 Merge branch 'cc_20250829_openStore' into 'master'
Cc 20250829 open store

See merge request hangzhou/java/custom_zxjp!157
2025-09-04 10:15:17 +00:00
wangff
435b24be48 fix:新增平台库数据源
feat:新增账密登录接口
2025-09-04 14:19:08 +08:00
苏竹红
c496ee7d0e feat:直营店 2025-09-03 11:29:59 +08:00
苏竹红
33e597496c feat:submitOrUpdate 2025-09-02 16:31:25 +08:00
苏竹红
366b208029 feat:submitOrUpdate 2025-09-02 15:43:12 +08:00
苏竹红
1e71d0dd42 feat:是否统管 2025-09-02 10:42:21 +08:00
苏竹红
5f7109e48b feat:菜品市场门店接口 2025-09-02 10:30:52 +08:00
苏竹红
f9c2222f10 feat:直营店开店 2025-09-01 16:36:44 +08:00