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

liyong

21 小时以前 dbd7fd484b5c7ed00cb895f227645848c3677c08

 src/main/java/com/ruoyi/approve/service/IApproveProcessService.java

@@ -3,14 +3,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.approve.pojo.ApproveNode;
import com.ruoyi.approve.vo.ApproveProcessVo;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;
import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.approve.bean.vo.ApproveGetAndUpdateVo;
import com.ruoyi.approve.bean.vo.ApproveProcessVO;
import com.ruoyi.project.system.domain.SysDept;

import java.io.IOException;
import java.text.ParseException;
import java.util.List;

public interface IApproveProcessService extends IService<ApproveProcess> {
@@ -25,7 +24,7 @@
     */
    List<SysDept> selectDeptListByDeptIds(Long[] deptIds);

    IPage<ApproveProcess> listAll(Page page, ApproveProcess approveProcess);
    IPage<ApproveProcessVo> listAll(Page page, ApproveProcess approveProcess);

    void delApprove(List<Long> ids);