From 8f7460c6ddff45ec39bf2026d75a3f4e2b26f13d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 11 Nov 2021 23:01:58 +0800
Subject: [PATCH] fix conflect

---
 zq-erp/src/main/resources/mybatis/mapper/common/SysCompanyDao.xml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/common/SysCompanyDao.xml b/zq-erp/src/main/resources/mybatis/mapper/common/SysCompanyDao.xml
index d83fb31..e6121b4 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/common/SysCompanyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/common/SysCompanyDao.xml
@@ -860,4 +860,7 @@
 			</if>
 		</where>
 	</select>
+	<select id="selectAll" resultMap="SysCompanyMap">
+		select * from sys_company
+	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1