Commit Graph

1325 Commits

Author SHA1 Message Date
shuo.wang
a98828529a fix 开店管理根据意向区域查询 2025-01-14 18:48:40 +08:00
苏竹红
fc622ef0ab feat:V2.4 2025-01-14 11:31:40 +08:00
shuo.wang
06e37e0e89 fix 2025-01-13 14:53:18 +08:00
苏竹红
5d2afdf9c5 feat:V2.4 2025-01-10 19:02:16 +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
c4199ee27c 加盟商详情,门店列表 2025-01-10 14:22:42 +08:00
shuo.wang
2d94266e62 开店列表+导出 2025-01-09 17:18:21 +08:00
shuo.wang
4acd471fbd 门店转让记录,修改门店招商专员/督导接口 2025-01-08 17:32:54 +08:00
shuo.wang
96f8ad4a7e 新建分店接口 2025-01-08 16:08:56 +08:00
shuo.wang
3579bb5f7c 查找加盟商接口,改造跟进日志接口 2025-01-08 14:19:07 +08:00
苏竹红
5ad1dc3ae1 feat:bugfix 2025-01-07 15:49:18 +08:00
苏竹红
860906fe3d feat:bugfix 2025-01-07 15:41:43 +08:00
苏竹红
85ccaf5dea feat:发票回传数据处理 2025-01-02 15:40:29 +08:00
苏竹红
b76e1a8968 feat:发票回传 2025-01-02 11:09:37 +08:00
苏竹红
91d2e4799d feat:发票回传 2025-01-02 10:48:03 +08:00
苏竹红
274fc7ccf9 feat:发票回传 2025-01-02 10:26:25 +08:00
苏竹红
67c6a72163 feat:证照同步 2024-12-20 16:22:10 +08:00
王晓鹏
eb10db5baa Merge branch 'cc_20241125_fix_addoperationLog' into 'master'
Cc 20241125 fix addoperation log

See merge request hangzhou/java/custom_zxjp!31
2024-11-25 11:05:26 +00:00
shuo.wang
23613d7a30 fix 审批人不是审批流中的人bug 2024-11-25 18:30:17 +08:00
shuo.wang
0bf59881df fix 2024-11-20 10:22:14 +08:00
shuo.wang
03c93e98f5 fix 2024-11-20 10:17:02 +08:00
shuo.wang
9225ca130e fix 2024-11-19 18:18:31 +08:00
shuo.wang
1fc63b7936 修改手机号,登录手机号和线索手机号一直 2024-11-18 15:48:31 +08:00
shuo.wang
7f2fd018e4 食安二证合一 2024-11-18 15:28:06 +08:00
shuo.wang
9e1e02aac1 fix 筹备列表 开店时间错误,导出也是 2024-11-14 11:41:48 +08:00
shuo.wang
b3d43ed041 fix 工作台字段 2024-11-07 15:31:49 +08:00
shuo.wang
265e993e7e fix 列表可见范围 2024-11-05 18:32:23 +08:00
shuo.wang
52af6ba903 多品牌使用 2024-11-05 18:23:00 +08:00
shuo.wang
ad906eadca 多品牌使用 2024-11-05 13:44:01 +08:00
shuo.wang
f71d969744 多品牌使用 2024-11-04 20:50:20 +08:00
shuo.wang
31e6e8a1a2 多品牌使用 2024-11-04 19:55:55 +08:00
shuo.wang
d900e0df03 add 接口跳过营帐通,add 平台建店字段 2024-10-30 10:52:41 +08:00
shuo.wang
e95a6c1a57 fix 2024-10-13 17:33:01 +08:00
shuo.wang
5cff7d9c30 fix 2024-10-13 10:45:34 +08:00
shuo.wang
494b74bf0f fix 2024-10-13 10:38:58 +08:00
shuo.wang
3c57954256 fix 2024-10-12 22:35:09 +08:00
shuo.wang
f07bde0a6e fix 2024-10-12 22:12:33 +08:00
shuo.wang
34c3818b39 Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust 2024-10-12 20:51:52 +08:00
shuo.wang
528a330633 fix desk 2024-10-12 20:42:50 +08:00
苏竹红
33e5bb08f7 feat:shopCode 2024-10-12 20:28:07 +08:00
苏竹红
e2a97da1bc Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust 2024-10-12 20:13:50 +08:00
苏竹红
d74eaab377 feat:排序 2024-10-12 20:13:39 +08:00
shuo.wang
363c95463c fix 2024-10-12 19:38:04 +08:00
shuo.wang
4495f22092 Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust
# Conflicts:
#	coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
2024-10-12 19:36:36 +08:00
shuo.wang
f6953a363d fix 2024-10-12 19:35:36 +08:00
苏竹红
3900475c48 Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust 2024-10-12 19:14:30 +08:00
苏竹红
fd0352c208 feat:排序 2024-10-12 19:14:19 +08:00
shuo.wang
0b528c4dee fix 2024-10-12 19:11:28 +08:00
shuo.wang
0d2b9906af fix 2024-10-12 19:02:14 +08:00
shuo.wang
b84f941c1f fix desk 2024-10-12 16:49:39 +08:00