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

liu

7 天以前 ee982b85c9ff09fbf6a6eb7c133b1e6f5fb160ba

 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/employee/vo/HrmEmployeeSaveReqVO.java

@@ -52,6 +52,21 @@
            message = "身份证号格式不正确")
    private String idCard;

    @Schema(description = "民族", example = "汉族")
    private String nation;

    @Schema(description = "婚姻状态", example = "已婚")
    private String marriageStatus;

    @Schema(description = "年龄", example = "30")
    private Integer age;

    @Schema(description = "学历", example = "本科")
    private String education;

    @Schema(description = "政治面貌", example = "中共党员")
    private String politicalStatus;

    @Schema(description = "入职日期", requiredMode = Schema.RequiredMode.REQUIRED, example = "2020-03-01")
    @NotNull(message = "入职日期不能为空")
    private LocalDate hireDate;
@@ -94,14 +109,14 @@

    @Schema(description = "教育经历列表")
    @Valid
    private List<HrmEmployeeEducationSaveReqVO> educationList;
    private List<HrmEmployeeEducationSaveReqVO> educations;

    @Schema(description = "工作经历列表")
    @Valid
    private List<HrmEmployeeWorkHistorySaveReqVO> workHistoryList;
    private List<HrmEmployeeWorkHistorySaveReqVO> workHistories;

    @Schema(description = "紧急联系人列表")
    @Valid
    private List<HrmEmployeeEmergencyContactSaveReqVO> emergencyContactList;
    private List<HrmEmployeeEmergencyContactSaveReqVO> emergencyContacts;

}