Merge remote-tracking branch 'origin/master'

mitao

23 小时以前 291a72bf35e2d39b816abc0ebf085cfa9da3ee06

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/OaApprovalMapper.java

@@ -4,6 +4,7 @@
import com.ruoyi.system.model.OaApproval;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.query.ApprovalListQuery;
import com.ruoyi.system.query.ApprovalNodeListQuery;
import com.ruoyi.system.vo.system.ApprovalVO;
import org.apache.ibatis.annotations.Param;