Merge branch 'master' into dev/feat/partner1.4_20231009

# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml
#	coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerIntentInfoDO.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java

coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerIntentInfoDO.java

@@ -104,4 +104,12 @@ public class HyPartnerIntentInfoDO implements Serializable {
 
     @ApiModelProperty("邮箱地址")
     private String email;
+
+    private Integer acquaintanceFlag;
+
+    private String acquaintanceName;
+
+    private Integer acquaintanceRelationshipType;
+
+    private String otherRelationshipType;
 }

coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java

@@ -87,4 +87,12 @@ public class PartnerIntentInfoRequest {
     @ApiModelProperty("提交标识  提交-true   暂存-false")
     private Boolean submitFlag;
 
+    private Integer acquaintanceFlag;
+
+    private String acquaintanceName;
+
+    private Integer acquaintanceRelationshipType;
+
+    private String otherRelationshipType;
+
 }

coolstore-partner-model/src/main/java/com/cool/store/response/mdm/BelongRegion.java

@@ -0,0 +1,26 @@
+package com.cool.store.response.mdm;
+
+import lombok.Data;
+
+/**
+ * @author Fun Li 2023/9/12 11:52
+ * @version 1.0
+ * mdm 所属大区 pojo
+ * 对应
+ * {
+ *      "id": "1642818197440036864",
+ *      "orgregionid": "Org001",
+ *      "orgregion": "东北战区"
+ * },
+ */
+@Data
+public class BelongRegion {
+
+    private String id;
+
+    private String orgregionid;
+
+    private String orgregion;
+
+
+}

coolstore-partner-model/src/main/java/com/cool/store/response/mdm/BusinessRegion.java

@@ -0,0 +1,22 @@
+package com.cool.store.response.mdm;
+
+import lombok.Data;
+
+/**
+ * @author Fun Li 2023/9/12 11:29
+ * @version 1.0
+ * mdm 业务区域 pojo
+ * 对应
+ * {
+ *     "id": "1643101868734676992",
+ *     "buarea": "东北战区"
+ * },
+ */
+@Data
+public class BusinessRegion {
+
+    private String id;
+
+    private String buarea;
+
+}

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

@@ -99,5 +99,12 @@ public class PartnerIntentInfoVO {
     @ApiModelProperty("创建时间")
     private Date createTime;
 
+    private Integer acquaintanceFlag;
+
+    private String acquaintanceName;
+
+    private Integer acquaintanceRelationshipType;
+
+    private String otherRelationshipType;
 
 }