Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 72aaf45389cd09c206ee1b90f0c7f5bf59782930

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

@@ -4,10 +4,14 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.dto.TCrmBranchDTO;
import com.ruoyi.system.export.TCrmBranchExport;
import com.ruoyi.system.model.TCrmBranch;
import com.ruoyi.system.model.TCrmDevice;
import com.ruoyi.system.query.TCrmBranchQuery;
import com.ruoyi.system.query.TSysAppUserQuery;
import com.ruoyi.system.vo.TCrmBranchVO;

import java.util.List;

/**
 * <p>
@@ -45,4 +49,11 @@
     * @return
     */
    R<Boolean> updateBranch(TCrmBranchDTO dto);

    /**
     * 导出
     * @param query
     * @return
     */
    List<TCrmBranchExport> exportList(TCrmBranchQuery query);
}