Commit Graph

4549 Commits

Author SHA1 Message Date
苏竹红
166e5c3d3c Merge branch 'cc_20251008_bigRegion' into 'master'
feat:所属大区

See merge request hangzhou/java/custom_zxjp!167
2025-10-08 09:16:13 +00:00
苏竹红
4b9e546ffb feat:所属大区 2025-10-08 09:51:00 +08:00
苏竹红
740f365a18 Merge branch 'cc_20251005_fuck' into 'master'
feat:大区总

See merge request hangzhou/java/custom_zxjp!166
2025-10-05 12:01:10 +00:00
苏竹红
3fbac3c28b feat:大区总 2025-10-05 20:00:46 +08:00
苏竹红
e13ffcdb55 Merge branch 'cc_20251005_fuck' into 'master'
Cc 20251005 fuck

See merge request hangzhou/java/custom_zxjp!165
2025-10-05 08:40:49 +00:00
苏竹红
9217f69237 feat:getPOSToken 2025-10-05 16:39:56 +08:00
苏竹红
f06b5683af feat:getPOSToken 2025-10-05 15:52:40 +08:00
苏竹红
3c53c4bc5d feat:getYlsToken 2025-09-28 22:00:39 +08:00
苏竹红
4cdc045ea6 feat:督导也能查看店 2025-09-26 16:44:27 +08:00
苏竹红
c9325fdb00 feat:签名 2025-09-26 14:56:44 +08:00
苏竹红
5e75465ebb Merge branch 'cc_20250925_addUserAndLicense_update' into 'master'
Cc 20250925 add user and license update

See merge request hangzhou/java/custom_zxjp!164
2025-09-25 09:50:41 +00:00
苏竹红
6bc6a3262a feat:mq 2025-09-25 17:50:08 +08:00
苏竹红
6ff4a7811f feat:mq 2025-09-25 17:23:41 +08:00
苏竹红
6d54e4de9c feat:门店人员更新 2025-09-25 16:57:55 +08:00
苏竹红
5c353d4de8 feat:store_master_signer_info 2025-09-24 10:06:15 +08:00
苏竹红
67430e9498 Merge branch 'cc_20250905_storeExtendInfo' into 'master'
Cc 20250905 store extend info

See merge request hangzhou/java/custom_zxjp!163
2025-09-24 01:57:58 +00: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
苏竹红
59ca00cc2d feat:签约之后重新推送数据 2025-09-19 17:42:47 +08:00
苏竹红
5239a72970 feat:法大大一期 2025-09-19 17:30:15 +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
苏竹红
b202c65b3a feat:法大大一期 限制提交去掉 2025-09-19 14:50:51 +08:00
wangff
8f7a044d28 fix:STOMP定义心跳0,10000 2025-09-19 14:41:37 +08:00
苏竹红
ba47781bd1 feat:法大大一期 限制提交去掉 2025-09-19 14:35:35 +08:00
苏竹红
6f38fb99ed feat:法大大一期 限制提交去掉 2025-09-19 14:28:57 +08:00
苏竹红
2053507ae7 feat:法大大一期 查询 2025-09-19 14:01:32 +08: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
苏竹红
f491de1116 feat:bug修复 2025-09-17 13:24:02 +08:00
苏竹红
a76af5b9d1 Merge branch 'cc_20250916_new' into 'master'
fix:新增获取接入物联网门店信息开放接口

See merge request hangzhou/java/custom_zxjp!159
2025-09-16 09:55:37 +00:00
苏竹红
4251b69eab feat:新建店添加合同编码字段 2025-09-16 11:14:54 +08:00
wangff
342c91fb89 fix:新增获取接入物联网门店信息开放接口 2025-09-16 10:50:13 +08:00
苏竹红
5c0bf74249 feat:listByMobile 改造 2025-09-12 10:50:08 +08:00
wangff
190ee8a5c1 fix:平台库配置 2025-09-11 16:06:49 +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
苏竹红
34ed5679e6 feat:第三方id 2025-09-11 09:32:59 +08:00
苏竹红
fe16305910 feat:getMessageTemplateCode 2025-09-10 19:32:50 +08:00
苏竹红
26bc8c7742 feat:DATE_FORMAT_SEC_9 2025-09-10 19:30:40 +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
苏竹红
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