Merge branch 'dev_New' into pcdz

zss

8 天以前 41d35c56043108b66a14e7a2d2d13bedfc2508e0

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

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

        // 创建合同记录