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

# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java

coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

@@ -87,6 +87,7 @@ public enum ErrorCodeEnum {
     LINE_PAY_IS_NOT_EXIST(500019, "意向金信息不存在！", null),
     INTENT_PASS(500020, "审核已通过，请刷新页面！", null),
     APPOINTMENT_TIME_FAIL(500020, "预约失败，请刷新后再试", null),
+    LINE_REGION_NOT_EXIST(500021, "线索的所属大区/分公司未填写", null),
 
     POINT_NOT_COMPLETE(600000, "铺位信息未填写完全，请完善后生成评估报告", null),
     POINT_NOT_EXIST(600001, "铺位信息不存在", null),
@@ -237,6 +238,7 @@ public enum ErrorCodeEnum {
     CONFIRM_THE_APPROVER(131006,"您提交的铺位暂时找不到选址审批人，请联系系统管理员配置选址审批权限后再提交铺位审批",null),
     CREATE_PASSWORD_FAIL(131007,"身份证号信息错误",null),
     GET_HOME_TEMPLATE_ERROR(131008,"获取首页模板失败",null),
+    THE_DATA_IS_NOT_FILLED(131009,"您有数据还未填写",null),
 
     TALLY_BOOK_NOT_EXIST(180001, "记账本数据不存在", null),
 

coolstore-partner-common/src/main/java/com/cool/store/enums/FranchiseBrandEnum.java

@@ -36,15 +36,12 @@ public enum FranchiseBrandEnum {
         if (StringUtils.isBlank(code)){
             return null;
         }
-        List<Integer> integerList = Arrays.stream(code.split(","))
-                .map(Integer::parseInt)
-                .collect(Collectors.toList());
-        StringBuffer stringBuffer = new StringBuffer();
+        int i = Integer.parseInt(code);
         for (FranchiseBrandEnum e : FranchiseBrandEnum.values()) {
-            if (integerList.contains(e.getCode())) {
-                stringBuffer.append(e.getDesc()).append(",");
+            if (i == e.getCode()) {
+                return e.getDesc();
             }
         }
-        return stringBuffer.toString();
+        return null;
     }
 }