Commit Graph

162 Commits

Author SHA1 Message Date
苏竹红
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
苏竹红
1a457343e5 feat:平台账号 2025-04-09 16:12:50 +08:00
苏竹红
c431754f28 feat:PC机会点 2025-04-07 10:08:56 +08:00
苏竹红
6be08c9770 Merge branch 'master' into cc_20250325_select 2025-04-03 16:51:16 +08:00
苏竹红
b111d1dfe7 Update application-online.properties 2025-04-03 05:47:37 +00:00
苏竹红
ef1f966332 Update application-online.properties 2025-04-03 05:05:29 +00:00
zhangchenbiao
456cbcd9ad 数据库更新 2025-04-03 11:37:57 +08:00
苏竹红
d4cb86b415 feat:外部接口接入 2025-04-02 09:16:43 +08:00
苏竹红
a54644b8bd feat:外部接口接入 2025-04-01 21:36:00 +08:00
shuo.wang
a2094c3ed5 fix 2025-02-28 09:59:56 +08:00
shuo.wang
6661802b49 fix 2025-02-27 17:56:31 +08:00
shuo.wang
a5caca6134 工作通知调整 2025-02-24 18:06:16 +08:00
shuo.wang
2807bc5b1c 工作通知调整 2025-02-24 18:00:19 +08:00
shuo.wang
fc73435687 测试工作通知 2025-02-24 17:12:00 +08:00
shuo.wang
f49159a754 测试工作通知 2025-02-24 17:02:54 +08:00
shuo.wang
5e7351fbfa add 企微通知 2025-02-14 16:19:57 +08:00
shuo.wang
71db4d6e6e Merge branch 'master' into cc_20250211_v2.6
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
2025-02-14 16:18:00 +08:00
shuo.wang
105e6febb9 fix 企微跳转链接 2025-02-13 17:23:04 +08:00
shuo.wang
bfd3f908e2 fix 企微跳转链接 2025-02-13 17:19:06 +08:00
shuo.wang
38e6b19fe2 fix 企微跳转链接 2025-02-13 17:10:01 +08:00
shuo.wang
ca23967be2 测试企微通知 2025-02-11 16:31:50 +08:00
苏竹红
81b135bba6 Merge branch 'master' into cc_20250106_v2.4
# Conflicts:
#	coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
2025-01-10 18:35:32 +08:00
shuo.wang
2d94266e62 开店列表+导出 2025-01-09 17:18:21 +08:00
shuo.wang
3579bb5f7c 查找加盟商接口,改造跟进日志接口 2025-01-08 14:19:07 +08:00
苏竹红
fae4d72e3b feat:V2.3.1 2025-01-07 14:40:56 +08:00
苏竹红
8d7d6c43d1 feat:配重 2025-01-04 10:37:44 +08:00
苏竹红
154b5d1aaf feat:发票回传解析 2025-01-02 14:41:13 +08:00
shuo.wang
52af6ba903 多品牌使用 2024-11-05 18:23:00 +08:00
shuo.wang
f97f2f66dd 多品牌使用 2024-11-04 20:26:32 +08:00