From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict

---
 zq-erp/src/main/java/com/matrix/system/common/dao/SysCompanyDao.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/common/dao/SysCompanyDao.java b/zq-erp/src/main/java/com/matrix/system/common/dao/SysCompanyDao.java
index 69d5c4a..47e5de8 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/dao/SysCompanyDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/dao/SysCompanyDao.java
@@ -40,4 +40,5 @@
 
 	public SysCompany selectForUpdate(Long comId);
 
+	List<SysCompany> selectAll();
 }
\ No newline at end of file

--
Gitblit v1.9.1