Merge remote-tracking branch 'hs/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727

coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java

@@ -577,6 +577,12 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
     @Override
     public Boolean assignFollowUser(String partnerId, String wantShopArea, Integer acceptAdjustType) {
         log.info("assignFollowUser partnerId:{}，wantShopArea：{}，acceptAdjustType：{}",partnerId,wantShopArea,acceptAdjustType);
+
+        List<HyPartnerLineInfoDO> lineFollowHistoryList = hyPartnerLineInfoDAO.getLineFollowHistoryList(partnerId);
+        //如果跟进次数大于1 直接使用上一次的招商经理
+        if (CollectionUtils.isNotEmpty(lineFollowHistoryList)){
+            return Boolean.TRUE;
+        }
         //当前加盟商线索
         HyPartnerLineInfoDO HyPartnerLineInfo = hyPartnerLineInfoDAO.getByPartnerId(partnerId);
         //如果意向区域没有绑定战区 不分配招商经理

coolstore-partner-service/src/main/java/com/cool/store/service/impl/NoticeService.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Slf4j
 @Service
 public class NoticeService {
-    @Value("${feishu.notice.link.url:null}")
+    @Value("${feishu.notice.link.url}")
     private String linkUrl;
     @Autowired
     private ISVHttpRequest isvHttpRequest;