Merge remote-tracking branch 'origin/master'

xuhy

1 天以前 b248e201845e9704cf01f7ac723a64e2570039f4

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

@@ -2,6 +2,8 @@

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;
@@ -17,4 +19,6 @@
public interface TLeaveService extends IService<TLeave> {

    PageInfo<LeaveListVO> pageList(LeaveListQuery query);

    PageInfo<LeaveUserListVO> leaveList(LeaveListUserQuery query);
}