From 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 18 Sep 2021 17:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.xml |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.xml b/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.xml
index 0e994fd..6aecf9a 100644
--- a/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.xml
+++ b/src/main/java/org/springblade/modules/shareholder/mapper/ShareholderMapper.xml
@@ -6,21 +6,23 @@
     <resultMap id="shareholderResultMap" type="org.springblade.modules.shareholder.entity.Shareholder">
         <id column="id" property="id"/>
         <result column="shareholder" property="shareholder"/>
-        <result column="
-
-shareholdingRatio" property="
-
-shareholdingratio"/>
+        <result column="shareholdingratio" property="shareholdingratio"/>
         <result column="beneficial" property="beneficial"/>
         <result column="capital" property="capital"/>
         <result column="capitalTime" property="capitaltime"/>
         <result column="cardid" property="cardid"/>
         <result column="cell" property="cell"/>
+        <result column="creditCode" property="creditcode"/>
     </resultMap>
 
 
     <select id="selectShareholderPage" resultMap="shareholderResultMap">
-        select * from sys_shareholder where is_deleted = 0
+        select * from sys_shareholder
+    </select>
+
+
+    <select id="selectShareholderInfo" resultMap="shareholderResultMap">
+        select * from sys_shareholder where creditCode=#{creditcode}
     </select>
 
 </mapper>

--
Gitblit v1.9.3