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

liu

7 天以前 ee982b85c9ff09fbf6a6eb7c133b1e6f5fb160ba

 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/employee/HrmEmployeeDO.java

@@ -89,6 +89,31 @@
    private String idCard;

    /**
     * 民族
     */
    private String nation;

    /**
     * 婚姻状态
     */
    private String marriageStatus;

    /**
     * 年龄
     */
    private Integer age;

    /**
     * 学历
     */
    private String education;

    /**
     * 政治面貌
     */
    private String politicalStatus;

    /**
     * 入职日期
     */
    private LocalDate hireDate;