Commit Graph

1454 Commits

Author SHA1 Message Date
苏竹红
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
苏竹红
89e9cf3b57 feat:老店新开特殊处理 2025-10-10 10:06:11 +08: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
苏竹红
5ada2f284f feat:法大大一期 查询 2025-09-17 15:48:38 +08:00
苏竹红
a855b824ca feat:法大大一期 2025-09-17 15:17:21 +08: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
苏竹红
220d5f09ea feat:合同推送修改 2025-09-10 09:33:00 +08:00
苏竹红
e6dc4d5688 feat:合同推送 2025-09-09 15:25:47 +08:00
苏竹红
302d38af2b feat:合同配置 2025-09-09 11:09:57 +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
苏竹红
83ddafb842 feat:addContractConfig 2025-09-08 18:46:42 +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
苏竹红
2d4402c351 feat:auditApprove 2025-09-08 10:42:53 +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
苏竹红
56f5d821ca feat:editMatterConfig 2025-09-01 13:19:28 +08:00
苏竹红
88ac3bae11 feat:editMatterConfig 2025-09-01 11:26:45 +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
苏竹红
0f9493839b feat:跳转url 2025-08-28 14:27:49 +08:00
苏竹红
5debcb3147 feat:跳转 2025-08-27 14:45:29 +08:00
苏竹红
d5b1960996 feat:通知接口 2025-08-27 11:24:00 +08:00
苏竹红
6aafc3970f feat:主数据同步 2025-08-18 09:29:44 +08:00