Commit Graph

3241 Commits

Author SHA1 Message Date
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
shuo.wang
874dd92bb9 fix 2025-04-03 09:25:20 +08:00
shuo.wang
081a23469c fix 2025-04-03 09:19:44 +08:00
shuo.wang
9bddbf53a3 fix 2025-04-02 20:45:53 +08:00
shuo.wang
a4a1d4c26c fix 2025-04-02 19:14:21 +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
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
苏竹红
1b917b7284 feat:外部接口接入 2025-04-02 09:55:00 +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
苏竹红
46227598c9 Merge branch 'cc_20250324' into 'master'
Cc 20250324

See merge request hangzhou/java/custom_zxjp!56
2025-04-01 10:13:14 +00:00
shuo.wang
20f3f36347 fix 2025-04-01 17:08:40 +08:00
shuo.wang
e4da6acf5e fix 2025-04-01 16:02:41 +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
01933a6d18 fix 2025-03-31 16:21:23 +08:00
shuo.wang
cc34f3b5f6 fix 2025-03-31 16:19:17 +08:00
shuo.wang
aa98da8017 铺位提交审核做检验 2025-03-31 15:50:34 +08:00
shuo.wang
9b8b9bdba2 铺位提交审核做检验 2025-03-31 15:49:42 +08:00
shuo.wang
a1b3cf0440 铺位提交审核做检验 2025-03-31 15:44:14 +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
苏竹红
4e919f0172 Merge branch 'cc_20250324_fix' into 'master'
加盟合同增加字段

See merge request hangzhou/java/custom_zxjp!55
2025-03-25 09:59:29 +00:00
shuo.wang
1d82a08d37 fix 2025-03-24 16:08:21 +08:00
shuo.wang
81a76a8d4b 增加,门店恢复状态,删除门店接口 2025-03-24 15:35:47 +08:00
shuo.wang
3ffcede71a 增加,门店恢复状态,删除门店接口 2025-03-24 15:28:31 +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
79008aa661 加盟合同增加字段 2025-03-24 14:23:22 +08:00
苏竹红
3397e9035e Merge branch 'cc_20250312_fix' into 'master'
Cc 20250312 fix

See merge request hangzhou/java/custom_zxjp!54
2025-03-20 11:20:46 +00:00
shuo.wang
f0b814cccf fix 2025-03-20 18:01:06 +08:00
shuo.wang
c7ae833e0b 加盟合同增加字段+导出字段增加 2025-03-12 17:40:15 +08:00
shuo.wang
298b46d044 加盟合同增加字段+导出字段增加 2025-03-12 17:32:50 +08:00
shuo.wang
d740d9ba6c 接口加拦截 2025-03-12 11:11:22 +08:00
shuo.wang
6f44f627f7 接口加拦截 2025-03-12 10:37:38 +08:00
苏竹红
c1fbba8b0d Merge branch 'cc_20240228_fix' into 'master'
fix partnerList

See merge request hangzhou/java/custom_zxjp!53
2025-03-05 09:33:46 +00:00
shuo.wang
1f81bc47fd fix partnerList 2025-03-05 13:47:39 +08:00
苏竹红
ef5a661121 Merge branch 'cc_20240228_fix' into 'master'
fix导出

See merge request hangzhou/java/custom_zxjp!52
2025-03-04 11:17:08 +00:00
shuo.wang
78fe00cac9 fix导出 2025-03-04 19:15:21 +08:00
苏竹红
77096dfe2c Merge branch 'cc_20240228_fix' into 'master'
Cc 20240228 fix

See merge request hangzhou/java/custom_zxjp!51
2025-03-04 09:33:44 +00:00
shuo.wang
006aab6212 fix 2025-03-04 16:44:30 +08:00
shuo.wang
c00d2127d3 fix 2025-03-04 16:16:51 +08:00