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

liyong

6 天以前 04dce61c02c10832665cdaf1aabf5b7e9b31da47

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

@@ -11,6 +11,7 @@
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.staff.service.StaffLeaveService;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.staff.pojo.StaffLeave;
import org.springframework.transaction.annotation.Transactional;
@@ -23,8 +24,10 @@
@AllArgsConstructor
@Service
public class StaffLeaveServiceImpl extends ServiceImpl<StaffLeaveMapper, StaffLeave> implements StaffLeaveService {
    @Autowired
    private StaffLeaveMapper staffLeaveMapper;

    @Autowired
    private StaffOnJobMapper staffOnJobMapper;

    //新增离职列表分页查询
@@ -97,6 +100,5 @@
        ExcelUtil<StaffLeaveDto> util = new ExcelUtil<StaffLeaveDto>(StaffLeaveDto.class);
        util.exportExcel(response, staffLeaves, "员工离职导出");
    }

}