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

liyong

4 天以前 4635770544e2d57416ad88a8983ee293919f5fec

 src/main/java/com/ruoyi/staff/service/impl/StaffLeaveServiceImpl.java

@@ -59,6 +59,7 @@
        StaffLeave staffLeave = new StaffLeave();
        staffLeave.setStaffOnJobId(staffLeaveDto.getStaffOnJobId());
        staffLeave.setReason(staffLeaveDto.getReason());
        staffLeave.setLeaveDate(staffLeaveDto.getLeaveDate());
        String reason = staffLeaveDto.getReason();
        if (StaffLeaveReasonOther.getCode().equals(reason)){
            staffLeave.setRemark(staffLeaveDto.getRemark());