苏竹红
|
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 |
|
苏竹红
|
5120b2c48c
|
feat:appid
|
2025-10-28 11:25:43 +08:00 |
|
苏竹红
|
b4365a795c
|
feat:appid
|
2025-10-28 10:02:43 +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 |
|
苏竹红
|
80d3f6efd0
|
feat:加盟部只能新建加盟店或者联营店
|
2025-10-27 15:43:21 +08:00 |
|
wangff
|
b2076cc6c5
|
feat:门店最近订货时间定时任务
|
2025-10-27 13:32:23 +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 |
|
苏竹红
|
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 |
|
苏竹红
|
47a371cbd7
|
feat:通知异步发布
|
2025-10-16 12:05: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 |
|
苏竹红
|
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 |
|
苏竹红
|
c9325fdb00
|
feat:签名
|
2025-09-26 14:56:44 +08:00 |
|
苏竹红
|
6ff4a7811f
|
feat:mq
|
2025-09-25 17:23:41 +08:00 |
|
苏竹红
|
6d54e4de9c
|
feat:门店人员更新
|
2025-09-25 16:57:55 +08:00 |
|
wangff
|
ad0b6f0ed9
|
fix:免登短期token接口；短期token换用户信息接口
|
2025-09-18 11:13:16 +08:00 |
|
苏竹红
|
fe16305910
|
feat:getMessageTemplateCode
|
2025-09-10 19:32:50 +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
|
514af329ac
|
fix:登录接口返回值修改
feat:新增refresh登录；新增登出接口
|
2025-09-05 14:53:32 +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 |
|
苏竹红
|
5f7109e48b
|
feat:菜品市场门店接口
|
2025-09-02 10:30:52 +08:00 |
|
苏竹红
|
f9c2222f10
|
feat:直营店开店
|
2025-09-01 16:36:44 +08:00 |
|
苏竹红
|
dce1fe5e52
|
feat:matterType
|
2025-08-29 13:16:33 +08:00 |
|
苏竹红
|
0f9493839b
|
feat:跳转url
|
2025-08-28 14:27:49 +08:00 |
|
苏竹红
|
eae27a530e
|
feat:异常处理
|
2025-08-27 14:42:02 +08:00 |
|
苏竹红
|
d5b1960996
|
feat:通知接口
|
2025-08-27 11:24:00 +08:00 |
|
苏竹红
|
6aafc3970f
|
feat：主数据同步
|
2025-08-18 09:29:44 +08:00 |
|
苏竹红
|
d52faf485b
|
feat：主数据同步
|
2025-08-13 17:23:00 +08:00 |
|
苏竹红
|
47caa1c5b6
|
feat：验签日志
|
2025-08-11 09:50:44 +08:00 |
|
shuo.wang
|
734da0c92b
|
兼容老的验签
|
2025-08-08 15:00:11 +08:00 |
|
shuo.wang
|
83b691fa0d
|
兼容老的验签
|
2025-08-08 10:33:22 +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
|
c91500f904
|
装修调整
|
2025-08-07 11:19:15 +08:00 |
|
shuo.wang
|
9bb391559c
|
红圈通接口 加校验
|
2025-08-04 10:47:00 +08:00 |
|
shuo.wang
|
a7065fabd9
|
红圈通接口
|
2025-07-31 15:47:33 +08:00 |
|
苏竹红
|
ff92573176
|
feat：bug
|
2025-07-30 15:46:19 +08:00 |
|
shuo.wang
|
a838db1fb5
|
openAPi验签
|
2025-07-28 09:45:19 +08:00 |
|
苏竹红
|
00f883192a
|
feat：事项
|
2025-07-27 22:20:33 +08:00 |
|
苏竹红
|
ba90fca7fe
|
feat：事项
|
2025-07-25 17:12:06 +08:00 |
|
苏竹红
|
b10f129271
|
feat：事项配置
|
2025-07-24 17:28:42 +08:00 |
|
shuo.wang
|
3ab154600c
|
门店装修属性增加
|
2025-07-24 16:08:30 +08:00 |
|
shuo.wang
|
0f17ecc0c5
|
门店装修属性增加
|
2025-07-24 16:05:09 +08:00 |
|
shuo.wang
|
9fa0d19cd4
|
Merge branch 'master' into cc_20250723_Decoration
# Conflicts:
# coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
|
2025-07-24 15:29:31 +08:00 |
|