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

coolstore-partner-model/src/main/java/com/cool/store/vo/ApplyBaseInfoVO.java

@@ -19,4 +19,7 @@ public class ApplyBaseInfoVO {
     @ApiModelProperty("所选省内是否含有开放城市")
     private Boolean provinceHasOpenArea;
 
+    @ApiModelProperty("线索状态:0公海线索;1跟进中;2合作中;3黑名单")
+    private Integer lineStatus;
+
 }

coolstore-partner-model/src/main/java/com/cool/store/vo/EnterpriseUserSingleInfoVO.java

@@ -32,7 +32,7 @@ public class EnterpriseUserSingleInfoVO {
         for (EnterpriseUserDO enterpriseUser : userList) {
             String userId = enterpriseUser.getUserId();
             boolean isContains = userIdMap.containsKey(userId);
-            if(isContains){
+            if(!isContains){
                 EnterpriseUserSingleInfoVO result = new EnterpriseUserSingleInfoVO();
                 result.setUserId(userId);
                 result.setUserName(enterpriseUser.getName());