# Conflicts: # haoban-manage3-service/src/main/resources/mapper/content/TabHaobanInteractRecordMapper.xml
销售线索服务校验 See merge request !2815
销售线索服务校验 See merge request !2814
Feature recommend See merge request !2812
跟进记录按会员维度查询 See merge request !2807
非空判断 See merge request !2806
群发助手-发内容素材 See merge request !2804
品牌名称不从门店获取 See merge request !2802
Feature/xgh/代开发调整25年 See merge request !2801
参数缺失校验 See merge request !2793
只处理销售单 See merge request !2791
朋友圈校验bug See merge request !2789
朋友圈校验bug See merge request !2788
Feature recommend See merge request !2786
