From bf0c7150546434c83f30602fd68951d70bf0faf3 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 15 Apr 2022 21:50:12 +0800
Subject: [PATCH] Merge branch 'developer'

---
 zq-erp/src/main/resources/mybatis/mapper/common/SysCompanyDao.xml |    6 +++++-
 1 files changed, 5 insertions(+), 1 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..5c612dd 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/common/SysCompanyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/common/SysCompanyDao.xml
@@ -761,7 +761,8 @@
 		com_logo,
 		com_valid,
 		com_functions,
-		com_plats
+		com_plats,
+		com_code
 		from sys_company
 		<where>
 			<if test="record!=null">
@@ -860,4 +861,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