Commit Graph

645 Commits

Author SHA1 Message Date
shuo.wang
4388cdfffc Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-03 17:24:53 +08:00
shuo.wang
24705ab1a2 mini 查询督导接口 2025-04-03 17:24:25 +08:00
苏竹红
6be08c9770 Merge branch 'master' into cc_20250325_select 2025-04-03 16:51:16 +08:00
苏竹红
f73a9f04f0 Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-03 16:50:48 +08:00
shuo.wang
060ef9f9af mini 查询督导接口 2025-04-03 15:05:01 +08:00
shuo.wang
04dd6675b7 mini 查询督导接口 2025-04-03 14:44:18 +08:00
shuo.wang
944695ab31 铺位,选址改造 2025-04-03 14:11:53 +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
shuo.wang
9bddbf53a3 fix 2025-04-02 20:45:53 +08:00
苏竹红
24fcb6334f feat:外部接口接入 2025-04-02 19:49:29 +08:00
shuo.wang
3369382c61 fix 2025-04-02 19:10:22 +08:00
shuo.wang
e079f025ba fix 2025-04-02 15:53:15 +08:00
shuo.wang
8d184a1267 feat:外部接口对接火马 2025-04-02 13:50:28 +08:00
苏竹红
8be5579ee3 feat:外部接口接入 2025-04-02 09:57:01 +08:00
苏竹红
d4cb86b415 feat:外部接口接入 2025-04-02 09:16:43 +08:00
苏竹红
a54644b8bd feat:外部接口接入 2025-04-01 21:36:00 +08:00
shuo.wang
f6fc1c133a Merge branch 'master' into cc_20250327_tallyBook
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
2025-04-01 18:50:27 +08:00
shuo.wang
4b59c1659e fix 2025-04-01 15:38:13 +08:00
shuo.wang
00a57cc6e6 获取状态为完成的门店列表接口+记账本定时任务 2025-03-31 17:36:10 +08:00
shuo.wang
4e3eda6659 PC+mini铺位改造 2025-03-31 15:37:22 +08:00
shuo.wang
ae381ea81a 记账本 2025-03-31 10:14:10 +08:00
shuo.wang
5bd795fec3 增加,门店恢复状态,删除门店接口 2025-03-24 15:12:50 +08:00
shuo.wang
879db971ea 增加,门店恢复状态,删除门店接口 2025-03-24 15:01:45 +08:00
shuo.wang
ef12033705 fix 2025-03-01 17:16:53 +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
苏竹红
7e14e1569c fix:登录调整 2025-02-20 16:22:59 +08:00
shuo.wang
12b6cbb38d Merge branch 'master' into cc_20250211_v2.6 2025-02-19 13:44:17 +08:00
苏竹红
87df6d4efa Merge branch 'master' into cc_20250218_V2.5.1 2025-02-19 09:37:44 +08:00
shuo.wang
d59b8feb3e 增加修改加盟商姓名接口 2025-02-18 15:11:59 +08:00
shuo.wang
3588919fcc Merge branch 'cc20250207_optimize_v2.5' into cc_20250211_v2.6 2025-02-17 15:32:16 +08:00
shuo.wang
f78fddf06f add 企微通知 2025-02-17 11:04:42 +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
9f61a428c1 Merge branch 'master' into cc20250207_optimize_v2.5
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java
2025-02-13 20:56:27 +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
1aa08b1b2d 测试企微通知 2025-02-11 18:09:20 +08:00
shuo.wang
ca23967be2 测试企微通知 2025-02-11 16:31:50 +08:00
shuo.wang
294b547385 v2.5拆分第一年度管理费字段 2025-02-11 14:47:55 +08:00
shuo.wang
c69bccd856 线索的结束跟进置灰 2025-01-16 16:57:53 +08:00
shuo.wang
4542242c42 fix 开店列表改造支持查询我管辖我负责的 2025-01-15 18:16:58 +08:00
shuo.wang
a5747908e2 fix /getLines返回分页 2025-01-14 18:23:41 +08:00