Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 22d0531ef01ace7a66a0c5cc3e313944fe2ec8b4

 ruoyi-system/src/main/java/com/ruoyi/system/service/TLeaveService.java

@@ -1,7 +1,12 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.applet.query.LeaveListUserQuery;
import com.ruoyi.system.applet.vo.LeaveUserListVO;
import com.ruoyi.system.model.TLeave;
import com.ruoyi.system.query.LeaveListQuery;
import com.ruoyi.system.vo.system.LeaveListVO;

/**
 * <p>
@@ -13,4 +18,7 @@
 */
public interface TLeaveService extends IService<TLeave> {

    PageInfo<LeaveListVO> pageList(LeaveListQuery query);

    PageInfo<LeaveUserListVO> leaveList(LeaveListUserQuery query);
}