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

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

@@ -34,6 +34,9 @@ public class BaseInfoVO {
     @ApiModelProperty("线索标签")
     private List<LabelBaseInfoVO> userPortraitList;
 
+    @ApiModelProperty("流程阶段:1意向加盟;2新店进展;")
+    private Integer workflowStage;
+
     private Integer workflowSubStage;
 
     @ApiModelProperty("子阶段状态")
@@ -53,6 +56,7 @@ public class BaseInfoVO {
         this.workflowSubStage = baseInfoVO.getWorkflowSubStage();
         this.wantShopAreaName = baseInfoVO.getWantShopAreaName();
         this.userPortraitList = baseInfoVO.getUserPortraitList();
+        this.workflowStage = baseInfoVO.getWorkflowStage();
         this.workflowSubStageStatus = baseInfoVO.getWorkflowSubStageStatus();
     }
 

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

@@ -82,6 +82,9 @@ public class LineInfoVO {
     @ApiModelProperty("流程阶段:1意向加盟;2新店进展;")
     private Integer workflowStage;
 
+    @ApiModelProperty("加盟身份 1个人加盟 2企业加盟")
+    private Integer joinType;
+
     /**
      * 流程子阶段
      */