Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

10 天以前 8e941a8eac3329725cdd59cfa2bf3482ccbf057a

 src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java

@@ -25,4 +25,10 @@
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date contractEndTime;

    private String emergencyContact;
    private String emergencyContactPhone;


    private String defaultPassword;
}