王非凡
7916851939
Merge #46 into master from cc_20251208_visit
fix:拜访线索查询逻辑修改
* cc_20251208_visit: (40 commits squashed)
- feat:拜访记录
- fix:拜访详情接口新增字段
- fix:新增状态转义字段
- fix:惩处单查询提供惩处待处理、惩处已处理状态筛选
- fix
- fix:管理员能查看所有加盟商
- fix:去掉部分字段非空校验
- fix:空校验
- Merge branch 'master' into cc_20251208_visit
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java
- fix
- fix:拜访记录失效延时消息
- fix:拜访记录统计
- fix:拜访记录统计新增筛选条件
- fix:字段转义
- feat:拜访调整
- feat:拜访调整_过滤我的
- feat:拜访调整_过滤我的
- feat:拜访字段调整
- feat:拜访字段调整
- Merge branch 'master' into cc_20251208_visit
- fix:拜访我的加盟商取消管辖权限过滤
- Merge branch 'master' into cc_20251208_visit
- fix:新增已分配招商经理的线索查询接口；拜访记录列表接口新增字段
- fix:新增字段
- fix:新老加盟商判断逻辑修复；统计接口新增筛选条件
- fix:过滤未分配招商经理的线索
- Merge branch 'master' into cc_20251208_visit
# Conflicts:
#	coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
- Merge branch 'master' into cc_20251208_visit
- Merge branch 'master' into cc_20251208_visit
- fix:拜访记录导出
- fix:拜访记录导出限制
- fix:拜访记录导出限制
- fix:铺位导出
- fix:铺位及拜访记录导出加锁时机修改
- fix:铺位导出新增字段
- fix:铺位导出新增字段
- fix
- fix:我的铺位导出
- Merge branch 'master' into cc_20251208_visit
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java
- fix:拜访线索查询逻辑修改
Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/46
2026-02-26 10:30:35 +00:00
..
2026-01-19 09:11:34 +00:00
2026-01-29 09:50:34 +00:00
2025-11-05 15:40:31 +08:00
2025-12-04 09:48:08 +00:00
2026-02-02 09:56:33 +00:00
2026-01-19 09:11:34 +00:00
2025-09-23 14:01:48 +08:00
2026-01-23 06:48:53 +00:00
2026-02-10 09:02:43 +00:00
2025-12-09 08:55:37 +00:00
2025-07-25 14:07:20 +08:00
2025-06-04 17:40:43 +08:00
2024-05-11 19:37:47 +08:00
2024-05-07 14:06:43 +08:00
2024-04-29 17:25:09 +08:00
2024-03-28 16:38:27 +08:00
2025-04-21 16:13:21 +08:00
2026-01-19 07:05:53 +00:00
2025-06-11 11:01:23 +08:00
2025-12-09 08:55:47 +00:00
2025-12-09 08:55:47 +00:00
2025-12-09 08:55:47 +00:00
2025-12-09 08:55:47 +00:00
2025-12-09 08:55:47 +00:00
2025-12-09 08:55:47 +00:00
2025-12-09 08:55:47 +00:00
2025-09-09 11:09:57 +08:00
2025-07-24 15:24:32 +08:00
2025-07-25 10:40:44 +08:00
2024-06-04 18:13:21 +08:00
2025-07-25 17:12:06 +08:00
2025-10-27 17:01:35 +08:00
2024-03-08 13:48:10 +08:00
2025-04-08 16:38:30 +08:00
2024-05-10 09:58:31 +08:00
2025-06-09 13:26:28 +08:00
2025-04-08 14:23:19 +08:00
2025-04-08 14:23:19 +08:00
2025-06-23 18:37:56 +08:00
2025-01-14 19:03:29 +08:00
2024-03-25 09:55:22 +08:00
2024-03-25 09:55:22 +08:00
2024-03-20 20:47:11 +08:00
2025-10-16 16:31:45 +08:00
2024-11-05 18:23:00 +08:00
2024-07-17 15:29:24 +08:00
2025-02-11 15:33:07 +08:00
2024-04-02 16:49:06 +08:00
2024-04-09 20:06:54 +08:00
2024-05-24 21:41:16 +08:00
2025-01-08 14:19:07 +08:00
2026-02-26 10:30:35 +00:00
2024-05-21 11:17:23 +08:00
2025-08-20 14:25:57 +08:00
2025-07-24 17:28:42 +08:00
2025-09-05 13:39:29 +08:00
2024-04-22 13:51:17 +08:00
2025-04-12 18:52:03 +08:00
2024-05-11 16:10:57 +08:00
2025-12-25 10:50:38 +00:00
2025-03-24 15:01:45 +08:00
2024-05-15 15:54:19 +08:00
2025-06-27 16:44:44 +08:00
2025-12-31 06:56:47 +00:00
2025-12-26 08:55:27 +00:00
2025-10-15 10:47:57 +08:00
2025-05-26 10:58:36 +08:00
2024-05-07 17:41:32 +08:00
2025-05-12 17:12:05 +08:00
2026-01-23 06:48:32 +00:00
2026-02-11 06:39:46 +00:00
2025-04-12 22:55:46 +08:00
2026-02-02 09:56:21 +00:00
2025-05-23 16:33:52 +08:00
2025-06-25 18:07:41 +08:00
2025-06-21 18:39:29 +08:00
2025-06-24 18:21:07 +08:00
2025-06-25 22:39:56 +08:00
2025-06-25 22:52:27 +08:00
2026-02-26 07:23:29 +00:00
2024-03-29 14:18:54 +08:00
2026-02-02 09:56:33 +00:00
2024-04-25 20:27:59 +08:00
2025-12-15 09:43:50 +00:00
2024-05-17 20:57:54 +08:00
2026-01-23 06:49:50 +00:00
2024-04-23 16:38:52 +08:00
2026-01-23 06:49:50 +00:00
2025-05-27 15:22:52 +08:00
2025-09-17 15:17:21 +08:00
2025-07-25 17:12:06 +08:00
2026-01-23 06:49:50 +00:00
2025-10-15 11:28:38 +08:00
2024-03-08 13:48:10 +08:00
2025-11-10 15:58:15 +08:00
2024-03-08 13:48:10 +08:00
2024-06-05 18:01:14 +08:00
2025-04-01 17:08:40 +08:00
2025-04-01 15:38:13 +08:00
2024-06-21 17:16:36 +08:00
2024-05-29 10:16:59 +08:00
2024-04-07 11:26:44 +08:00
2025-01-08 17:32:54 +08:00
2025-11-10 15:58:15 +08:00
2024-03-08 13:48:10 +08:00
2025-04-28 22:24:49 +08:00