Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-ma...

huminmin

昨天 0b74a2f97b75a582ec4a3c5380523c503abff31f

Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New

# Conflicts:
#	src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java

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

@@ -154,9 +154,11 @@
        StaffOnJobDto staffOnJobDto = new StaffOnJobDto();
        BeanUtils.copyProperties(staffOnJob, staffOnJobDto);
        // 查询岗位名称
        SysPost post = sysPostMapper.selectPostById((long) staffOnJob.getSysPostId());
        if (post != null) {
            staffOnJobDto.setPostName(post.getPostName());
        if (staffOnJob.getSysPostId() != null) {
            SysPost post = sysPostMapper.selectPostById(staffOnJob.getSysPostId().longValue());
            if (post != null) {
                staffOnJobDto.setPostName(post.getPostName());
            }
        }

        // 查询合同信息