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

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

@@ -22,6 +22,9 @@ public class PartnerLineBaseInfoVO {
     @ApiModelProperty("hy_partner_user_info.partner_id")
     private String partnerId;
 
+    @ApiModelProperty("hy_partner_line_info.id")
+    private Long partnerLineId;
+
     @ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同")
     private String workflowStage;