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 |
|
苏竹红
|
6d54e4de9c
|
feat:门店人员更新
|
2025-09-25 16:57:55 +08:00 |
|
wangff
|
190ee8a5c1
|
fix:平台库配置
|
2025-09-11 16:06:49 +08:00 |
|
wangff
|
0d42743778
|
Merge branch 'cc_20250909_new' into cc_20250903_big_screen
|
2025-09-09 10:46:29 +08:00 |
|
wangff
|
d7b9f20f1f
|
fix:配置
|
2025-09-04 14:34:25 +08:00 |
|
wangff
|
f4cbe548c7
|
fix:配置
|
2025-09-04 14:33:00 +08:00 |
|
wangff
|
435b24be48
|
fix:新增平台库数据源
feat:新增账密登录接口
|
2025-09-04 14:19:08 +08:00 |
|
苏竹红
|
8219e8b869
|
Merge branch 'cc_20250813_storeMaster' into 'master'
Cc 20250813 store master
See merge request hangzhou/java/custom_zxjp!154
|
2025-08-21 09:10:08 +00:00 |
|
苏竹红
|
bc48826339
|
feat:1
|
2025-08-21 13:48:44 +08:00 |
|
苏竹红
|
64c6fa229a
|
feat:加盟费处理
|
2025-08-20 14:37:20 +08:00 |
|
苏竹红
|
d81b4725e0
|
feat:加盟费处理
|
2025-08-20 14:32:47 +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
|
71591e985a
|
装修调整
|
2025-08-06 17:42:34 +08:00 |
|
苏竹红
|
0b0e15e4c9
|
feat：getModuleList
|
2025-07-29 20:32:54 +08:00 |
|
shuo.wang
|
2859a8bc75
|
feat
|
2025-07-25 10:20:09 +08:00 |
|
shuo.wang
|
eb3826d1ee
|
feat
|
2025-07-25 09:43:29 +08:00 |
|
shuo.wang
|
e93ec15dc2
|
装修接口
|
2025-07-25 09:35:08 +08:00 |
|
shuo.wang
|
e87bba019f
|
ab
|
2025-07-11 10:41:22 +08:00 |
|
shuo.wang
|
825b8cde80
|
Merge branch 'master' into cc_20250710_userRegion
|
2025-07-11 10:41:04 +08:00 |
|
shuo.wang
|
d58623a6c2
|
ab
|
2025-07-11 10:40:51 +08:00 |
|
shuo.wang
|
d257c19496
|
创建门店
|
2025-07-11 10:39:59 +08:00 |
|
shuo.wang
|
e3b177261b
|
mq fix
|
2025-07-09 10:28:40 +08:00 |
|
苏竹红
|
8228731004
|
feat：askbot
|
2025-07-03 11:18:20 +08:00 |
|
苏竹红
|
8d3f7dca85
|
feat：域名
|
2025-07-03 10:04:51 +08:00 |
|
苏竹红
|
257b586633
|
feat：域名
|
2025-07-03 09:59:21 +08:00 |
|
shuo.wang
|
868343b9b5
|
数据库地址更改
|
2025-06-23 16:03:16 +08:00 |
|
苏竹红
|
2571ed2956
|
feat：oss配置
|
2025-06-17 14:56:51 +08:00 |
|
苏竹红
|
423b2b921a
|
feat:环境切换
|
2025-06-05 16:56:22 +08:00 |
|
苏竹红
|
197e833f90
|
feat:环境切换
|
2025-06-05 15:50:24 +08:00 |
|
苏竹红
|
747858b9cf
|
feat:回调
|
2025-06-04 14:29:20 +08:00 |
|
杨杰
|
a6f56758ee
|
Update application-online.properties
|
2025-05-28 07:50:31 +00:00 |
|
苏竹红
|
c9b6ccdee4
|
feat:正新菜品token
|
2025-05-13 18:41:55 +08:00 |
|
苏竹红
|
9939a7c1aa
|
feat:新管家
|
2025-05-09 15:10:44 +08:00 |
|
苏竹红
|
cd60b26680
|
feat:xxl
|
2025-05-08 14:15:37 +08:00 |
|
苏竹红
|
96c9e45093
|
Merge remote-tracking branch 'origin/master' into cc_20250325_select
# Conflicts:
# coolstore-partner-web/src/main/resources/application-online.properties
|
2025-04-17 20:13:56 +08:00 |
|
苏竹红
|
d1fb8d99ff
|
feat:云流水
|
2025-04-17 16:49:23 +08:00 |
|
苏竹红
|
7bd4f2503d
|
feat:云流水
|
2025-04-17 16:48:29 +08:00 |
|
苏竹红
|
f57cbfa78f
|
feat:云流水
|
2025-04-17 16:45:28 +08:00 |
|
苏竹红
|
d54537937a
|
feat:云流水
|
2025-04-17 16:02:12 +08:00 |
|
苏竹红
|
eb9f41454e
|
feat:云流水
|
2025-04-16 19:00:19 +08:00 |
|
苏竹红
|
b3583b4dd9
|
feat:OSS切换
|
2025-04-15 19:40:11 +08:00 |
|
苏竹红
|
240523f8d1
|
feat:OSS切换
|
2025-04-15 19:33:51 +08:00 |
|
苏竹红
|
7bb472de68
|
feat:POS
|
2025-04-15 13:48:49 +08:00 |
|
苏竹红
|
566a4ec51a
|
feat:推送
|
2025-04-13 21:23:43 +08:00 |
|
苏竹红
|
b650b31cb8
|
feat:域名切换
|
2025-04-12 16:50:06 +08:00 |
|
shuo.wang
|
6a0aebce31
|
fix
|
2025-04-12 16:16:13 +08:00 |
|
苏竹红
|
6b058db1b5
|
Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select
# Conflicts:
# coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
|
2025-04-11 16:14:42 +08:00 |
|
苏竹红
|
42d81b1043
|
feat:mini
|
2025-04-11 16:11:52 +08:00 |
|
shuo.wang
|
773813c269
|
增加接口
|
2025-04-11 16:10:40 +08:00 |
|
苏竹红
|
080019ac0d
|
feat:平台账号
|
2025-04-10 20:29:57 +08:00 |
|