Commit Graph

99 Commits

Author SHA1 Message Date
shuo.wang
521041447e 数据处理 2025-05-28 15:32:23 +08:00
shuo.wang
bd3fa05bf2 统计报表接口,数据梳理接口 2025-05-15 17:58:06 +08:00
shuo.wang
f09b89b5fe 报表列表接口 2025-05-14 14:20:27 +08:00
shuo.wang
176e403813 加盟报表代码 2025-05-13 17:00:13 +08:00
苏竹红
f04977cc7e Merge branch 'cc_20250509_import_data' into 'master'
Cc 20250509 import data

See merge request hangzhou/java/custom_zxjp!74
2025-05-12 11:28:30 +00:00
shuo.wang
3564fb1bfb fix 2025-05-12 18:32:38 +08:00
苏竹红
b15c9eed79 feat:askbot 门店获取方式变更 2025-05-12 10:38:19 +08:00
shuo.wang
11c597a8f0 feat:签约合同优化 + 数据处理 2025-05-08 15:32:40 +08:00
shuo.wang
77c41d0990 feat:签约合同优化 2025-05-08 13:32:20 +08:00
shuo.wang
6dd365a065 feat:签约合同优化 2025-05-08 11:16:40 +08:00
shuo.wang
c5bcfee942 fix 开店管理增加合同签约,门店编码trim 修复导出字段没值 2025-05-06 17:18:54 +08:00
shuo.wang
bd80c5477f feat:密码数据处理,验签排除空字符串,导出接口 2025-04-28 22:24:49 +08:00
shuo.wang
574e0662e1 加盟合同优化 2025-04-22 11:45:12 +08:00
shuo.wang
80500fd6a6 建店阶段审批流 2025-04-17 16:36:42 +08:00
苏竹红
a905e2be3b feat:OSS切换 2025-04-16 11:50:24 +08:00
shuo.wang
c8fa77699d 老店 2025-04-12 20:20:36 +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
苏竹红
080019ac0d feat:平台账号 2025-04-10 20:29:57 +08:00
shuo.wang
50688f04c8 fix 2025-04-10 16:09:14 +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
26d11b7d17 增加字段 同步数据组合 2025-04-07 19:37:12 +08:00
shuo.wang
7465932495 fix 记账本定时任务 2025-04-07 11:22:14 +08:00
shuo.wang
5e1a69a03b add 字段 2025-04-06 14:38:14 +08:00
shuo.wang
944695ab31 铺位,选址改造 2025-04-03 14:11:53 +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
00a57cc6e6 获取状态为完成的门店列表接口+记账本定时任务 2025-03-31 17:36:10 +08:00
shuo.wang
1d82a08d37 fix 2025-03-24 16:08:21 +08:00
shuo.wang
879db971ea 增加,门店恢复状态,删除门店接口 2025-03-24 15:01:45 +08:00
shuo.wang
e718a31564 fix 2025-03-03 20:10:46 +08:00
shuo.wang
26e05b3e7c fix 2025-03-03 20:01:01 +08:00
shuo.wang
ceb385dee7 fix 2025-03-01 17:45:14 +08:00
shuo.wang
ef12033705 fix 2025-03-01 17:16:53 +08:00
shuo.wang
74fa4a0fd1 fix 2025-02-25 15:31:42 +08:00
shuo.wang
528ff2660f fix 2025-02-18 16:23:58 +08:00
shuo.wang
1c863e40f2 fix 2025-02-18 16:20:15 +08:00
shuo.wang
d1a1df62e9 fix getShopList 2025-02-18 14:05:07 +08:00
shuo.wang
a4b45e2ec2 fix getShopList 2025-02-18 13:59:16 +08:00
shuo.wang
8b7b15aea1 fix 展示全部招商专员 2025-02-07 18:00:04 +08:00
苏竹红
78af1e29d5 fix:铺位推送bug 2025-02-06 10:02:38 +08:00
shuo.wang
a3b3a835e0 fix 计划开业时间 2025-01-23 14:43:30 +08:00
shuo.wang
07cd613e32 fix getBranchShopList 2025-01-22 11:31:08 +08:00
shuo.wang
1c6c2de8c0 fix initShop 2025-01-22 10:17:57 +08:00
苏竹红
9f9a1c890c Merge remote-tracking branch 'origin/cc_20250106_v2.4' into cc_20250106_v2.4 2025-01-21 16:12:39 +08:00
苏竹红
532bf7d366 feat:筛选 2025-01-21 16:12:24 +08:00
shuo.wang
77a89376f3 fix getShopList 修改获取获取店铺列表逻辑 2025-01-21 15:08:25 +08:00
shuo.wang
4542242c42 fix 开店列表改造支持查询我管辖我负责的 2025-01-15 18:16:58 +08:00
shuo.wang
73a3ab769d fix 开店管理查询条件 2025-01-14 19:03:29 +08:00
shuo.wang
a98828529a fix 开店管理根据意向区域查询 2025-01-14 18:48:40 +08:00
苏竹红
fc622ef0ab feat:V2.4 2025-01-14 11:31:40 +08:00