wangff
|
e8d0006dcb
|
fix:POS及营帐通开通流程修改
|
2025-10-24 14:08:57 +08:00 |
|
苏竹红
|
000d9e8111
|
Merge branch 'cc_20250903_big_screen' into 'master'
fix:补充遗失代码
See merge request hangzhou/java/custom_zxjp!173
|
2025-10-23 10:31:05 +00:00 |
|
wangff
|
7c44ec246e
|
fix:补充遗失代码
|
2025-10-22 16:50:31 +08:00 |
|
苏竹红
|
1203b8acf3
|
Merge branch 'master' into cc_20251016_async
# Conflicts:
# coolstore-partner-common/src/main/java/com/cool/store/executor/MdcTaskExecutor.java
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/MessageTemplateServiceImpl.java
|
2025-10-16 17:29:07 +08:00 |
|
苏竹红
|
f112df17b0
|
feat:通知异步发布
|
2025-10-16 13:14:43 +08:00 |
|
苏竹红
|
47a371cbd7
|
feat:通知异步发布
|
2025-10-16 12:05:09 +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 |
|
wangff
|
2a8abd0b3e
|
fix:添加门店mq消息新增省市区字段
|
2025-10-14 11:00:19 +08:00 |
|
苏竹红
|
b4e88f5424
|
feat:云流水
|
2025-10-13 16:03:32 +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 |
|
苏竹红
|
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 |
|
苏竹红
|
6bc6a3262a
|
feat:mq
|
2025-09-25 17:50:08 +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
|
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 |
|
苏竹红
|
f491de1116
|
feat:bug修复
|
2025-09-17 13:24:02 +08:00 |
|
苏竹红
|
4251b69eab
|
feat:新建店添加合同编码字段
|
2025-09-16 11:14:54 +08:00 |
|
wangff
|
342c91fb89
|
fix:新增获取接入物联网门店信息开放接口
|
2025-09-16 10:50:13 +08:00 |
|
wangff
|
733caec6a0
|
fix:即时通知消息新增后获取id
|
2025-09-11 10:37:01 +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 |
|
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 |
|
苏竹红
|
5c85b79c8e
|
feat:user->person
|
2025-09-08 10:44:40 +08:00 |
|
苏竹红
|
e682027be5
|
feat:getStoreListByMobile
|
2025-09-05 16:23:29 +08:00 |
|
苏竹红
|
910efd055d
|
feat:getStoreListByMobile
|
2025-09-05 15:51:21 +08:00 |
|
wangff
|
514af329ac
|
fix:登录接口返回值修改
feat:新增refresh登录；新增登出接口
|
2025-09-05 14:53:32 +08:00 |
|
苏竹红
|
8465432264
|
feat:校验去掉
|
2025-09-04 19:12:25 +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
|
5258badf91
|
fix:动态数据源切面所在目录移动
|
2025-09-04 14:26:26 +08:00 |
|
wangff
|
435b24be48
|
fix:新增平台库数据源
feat:新增账密登录接口
|
2025-09-04 14:19:08 +08:00 |
|
苏竹红
|
a11e150630
|
feat:获取用户只有督导用户
|
2025-09-03 17:15:45 +08:00 |
|
苏竹红
|
5d1f424d5b
|
feat:thirdHandleMessage
|
2025-09-03 14:49:31 +08:00 |
|
苏竹红
|
2679d341cb
|
feat:submitOrUpdate
|
2025-09-03 09:31:15 +08:00 |
|
苏竹红
|
366b208029
|
feat:submitOrUpdate
|
2025-09-02 15:43:12 +08:00 |
|
苏竹红
|
b36fbd7af2
|
feat:franchiseFeeDO
|
2025-09-02 11:34:39 +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 |
|