Commit Graph

1377 Commits

Author SHA1 Message Date
shuo.wang
773813c269 增加接口 2025-04-11 16:10:40 +08:00
shuo.wang
74571cbd18 fix 2025-04-11 14:32:06 +08:00
shuo.wang
7654d8e520 fix 2025-04-11 14:10:08 +08:00
shuo.wang
f8ec59a1d9 Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-11 12:18:20 +08:00
shuo.wang
6c1cf4ad48 fix 2025-04-11 12:16:49 +08:00
苏竹红
92a212b836 Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java
2025-04-11 10:29:06 +08:00
shuo.wang
f0806c1435 fix 2025-04-11 10:05:24 +08:00
shuo.wang
c18638f4b9 fix 2025-04-10 21:55:27 +08:00
苏竹红
080019ac0d feat:平台账号 2025-04-10 20:29:57 +08:00
shuo.wang
05d592625e 加字段 2025-04-10 18:51:14 +08:00
shuo.wang
9c5896fc0a 加必填校验 2025-04-10 17:36:03 +08:00
shuo.wang
7a47e35104 fix 2025-04-10 16:29:41 +08:00
shuo.wang
fd980c0acb fix 2025-04-10 11:31:47 +08:00
shuo.wang
f7bbd74990 add 字段 2025-04-10 10:57:09 +08:00
shuo.wang
e4af38601a fix 2025-04-10 10:13:58 +08:00
shuo.wang
616c8b15f4 Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-09 16:56:50 +08:00
shuo.wang
b329c10432 fix 2025-04-09 16:56:11 +08:00
苏竹红
1a457343e5 feat:平台账号 2025-04-09 16:12:50 +08:00
苏竹红
abc7c206c4 feat:平台账号 2025-04-09 10:04:35 +08:00
shuo.wang
f42f751cce 改造平台建店接口 2025-04-08 21:12:29 +08:00
shuo.wang
d82f99533b 改造平台建店接口 2025-04-08 20:39:17 +08:00
shuo.wang
80b5afe47f fix + 枚举,仓库数据等 2025-04-08 16:38:30 +08:00
苏竹红
4469c44ebb Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-08 15:23:26 +08:00
苏竹红
c08905399c feat:平台账号 2025-04-08 15:22:47 +08:00
shuo.wang
d7869f39da 小程序首页模块自定义 2025-04-08 14:23:19 +08:00
shuo.wang
26d11b7d17 增加字段 同步数据组合 2025-04-07 19:37:12 +08:00
shuo.wang
475800898a fix 2025-04-07 14:15:35 +08:00
shuo.wang
c451901924 改造 2025-04-06 18:34:06 +08:00
shuo.wang
5e1a69a03b add 字段 2025-04-06 14:38:14 +08:00
shuo.wang
5e99cdb5d4 接口加字段 2025-04-05 16:15:28 +08:00
苏竹红
6be08c9770 Merge branch 'master' into cc_20250325_select 2025-04-03 16:51:16 +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
shuo.wang
9bddbf53a3 fix 2025-04-02 20:45:53 +08:00
shuo.wang
28ac29f8d1 Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select 2025-04-02 19:10:55 +08:00
shuo.wang
3369382c61 fix 2025-04-02 19:10:22 +08:00
苏竹红
6fdd6fc9c4 feat:外部接口接入 2025-04-02 17:54:38 +08:00
shuo.wang
8d184a1267 feat:外部接口对接火马 2025-04-02 13:50:28 +08:00
苏竹红
d4cb86b415 feat:外部接口接入 2025-04-02 09:16:43 +08:00
苏竹红
a54644b8bd feat:外部接口接入 2025-04-01 21:36:00 +08:00
zhangchenbiao
b9daf94531 删除不用字段 2025-04-01 20:00:06 +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
20f3f36347 fix 2025-04-01 17:08:40 +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
193f35bded Merge branch 'master' into cc_20250324 2025-03-26 14:08:40 +08:00
shuo.wang
5bd795fec3 增加,门店恢复状态,删除门店接口 2025-03-24 15:12:50 +08:00
shuo.wang
79008aa661 加盟合同增加字段 2025-03-24 14:23:22 +08:00