Go to file

王非凡 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 &#39;master&#39; into cc_20251208_visit
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #&#9;coolstore-partner-dao/src/main/java/com/cool/store/dao/store/StoreMasterSignerInfoDAO.java
    #&#9;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 &#39;master&#39; into cc_20251208_visit

  - fix:拜访我的加盟商取消管辖权限过滤

  - Merge branch &#39;master&#39; into cc_20251208_visit

  - fix:新增已分配招商经理的线索查询接口；拜访记录列表接口新增字段

  - fix:新增字段

  - fix:新老加盟商判断逻辑修复；统计接口新增筛选条件

  - fix:过滤未分配招商经理的线索

  - Merge branch &#39;master&#39; into cc_20251208_visit
    
    # Conflicts:
    #&#9;coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml

  - Merge branch &#39;master&#39; into cc_20251208_visit

  - Merge branch &#39;master&#39; into cc_20251208_visit

  - fix:拜访记录导出

  - fix:拜访记录导出限制

  - fix:拜访记录导出限制

  - fix:铺位导出

  - fix:铺位及拜访记录导出加锁时机修改

  - fix:铺位导出新增字段

  - fix:铺位导出新增字段

  - fix

  - fix:我的铺位导出

  - Merge branch &#39;master&#39; into cc_20251208_visit
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
    #&#9;coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java
    #&#9;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

.m2

feta:切换

2025-12-17 14:05:29 +08:00

coolstore-partner-common

Merge #44 into master from cc_20251208_visit

2026-02-11 06:39:46 +00:00

coolstore-partner-dao

Merge #46 into master from cc_20251208_visit

2026-02-26 10:30:35 +00:00

coolstore-partner-model

Merge #43 into master from cc_20251208_visit