Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmStoreController.java

@@ -159,14 +159,11 @@ public class HmStoreController {
         if (CollectionUtils.isNotEmpty(statusList)) {
             ServiceResponse<List<String>> hmClerkResp = this.hmQrcodeApiService.listHasQrcodeClerk(enterpriseId,
                     statusList);
-            if (!hmClerkResp.isSuccess()) {
-
-            }
             if (CollectionUtils.isNotEmpty(hmClerkResp.getResult())) {
                 status3List.addAll(hmClerkResp.getResult());
             }
             status4List
-                    .addAll(statusList.stream().filter(id -> (!status2List.contains(id) && !status3List.contains(id)))
+                    .addAll(statusList.stream().filter(id -> (!status3List.contains(id)))
                             .collect(Collectors.toList()));
         }
         logger.info("导购列表未开启客户联系的={} , 已有单人活码的={}, 可以创建单人活码的={}", status2List, status3List, status4List);