Commit Graph

154 Commits

Author SHA1 Message Date
苏竹红
7703e4ef09 feat:营账通key 2025-11-18 15:08:35 +08:00
苏竹红
579bef59cd feat:优化 2025-11-18 10:28:47 +08:00
wangff
9256332d11 Merge branch 'refs/heads/master' into cc_20251112_wallet
# Conflicts:
#	coolstore-partner-web/src/main/resources/application-ab.properties
#	coolstore-partner-web/src/main/resources/application-test.properties
2025-11-14 13:13:52 +08:00
苏竹红
9f042b9dbd feat:钱包接口对接 2025-11-13 18:44:19 +08:00
苏竹红
368f97774a feat:信发 2025-11-12 13:51:46 +08:00
苏竹红
7f342a168d feat:OkHttpClient 2025-11-11 18:16:21 +08:00
wangff
549a4fbd04 fix:补充配置 2025-11-07 14:42:39 +08:00
苏竹红
05210119f1 feat:信发 2025-11-05 17:56:16 +08:00
苏竹红
f3dc39b911 feat:信发 2025-11-05 17:47:47 +08:00
苏竹红
e10525cedd feat:getStoreXinFaDeviceDetail 2025-11-05 10:04:18 +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
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
苏竹红
0545fee340 feat:通知配置 2025-10-15 11:12:22 +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