Merge remote-tracking branch 'origin/master'

xuhy

5 天以前 1ec94c00e5c312818c9e1e3742ca838e60b7e5e7

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.export.TCrmBranchExport;
import com.ruoyi.system.model.TCrmBranch;
import com.ruoyi.system.query.TCrmBranchQuery;
import com.ruoyi.system.vo.TCrmBranchVO;
@@ -26,4 +27,12 @@
     * @return
     */
    List<TCrmBranchVO> pageList(@Param("query") TCrmBranchQuery query, @Param("pageInfo")PageInfo<TCrmBranchVO> pageInfo);

    /**
     * 导出列表
     *
     * @param query 查询参数
     * @return
     */
    List<TCrmBranchExport> exportList(@Param("query")TCrmBranchQuery query);
}