suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml
This commit is contained in:
pserimal
2023-06-09 17:56:39 +08:00
parent 803625b20a 7fe6a15cb6
commit 94a7dfda58
4 changed files with 275 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewDO.java
View File

@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
/**
*
* @author zhangchenbiao
* @date 2023-05-29 03:52
* @date 2023-06-09 05:51
*/
@Data
@Builder
@@ -27,8 +27,8 @@ public class HyPartnerInterviewDO implements Serializable {
@ApiModelProperty("hy_partner_line_info.id")
private Long partnerLineId;
@ApiModelProperty("hy_partner_interview_arrangement.id")
private Long interviewArrangementId;
@ApiModelProperty("hy_partner_interview_plan.id")
private Long interviewPlanId;
@ApiModelProperty("hy_partner_user_info.partner_id")
private String partnerId;
@@ -74,4 +74,13 @@ public class HyPartnerInterviewDO implements Serializable {
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("审批发起时间")
private Date approveTime;
@ApiModelProperty("加盟商进入面试时间")
private Date partnerEnterTime;
@ApiModelProperty("面试官进入面试时间")
private Date interviewerEnterTime;
}