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

# Conflicts:
#	coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
#	coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoVO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java

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

@@ -57,6 +57,7 @@ public enum ErrorCodeEnum {
     ZONE_NOT_EXIST(500004, "战区不存在！", null),
     PARTNER_BASEINFO_NOT_EXIST(500005, "基本信息不存在！", null),
     INTENT_INFO_NOT_EXIST(500006, "意向信息不存在！", null),
+    INTENT_AREA_NOT_BING_ZONE(500007, "意向区域没有绑定战区 分配招商经理失败！", null),
 
     INTERVIEW_ENTER_FAIL(1021101, "进入面试间失败", null),
     DINGDING_USER_NOT_EXIST(1021102, "用户钉钉信息不存在，无法发起资质审核！", null),