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

liyong

15 小时以前 217f8ee47bb19f8e154d4012dbe232f0d7af3a3d

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

@@ -69,6 +69,7 @@
        }
        // 创建入职数据
        staffOnJobPrams.setContractExpireTime(staffOnJobPrams.getContractEndTime());
        staffOnJobPrams.setStaffState(1);
        staffOnJobMapper.insert(staffOnJobPrams);

        // 创建合同记录