Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/document/document-server/src/main/resources/mapper/WarehouseMapper.xml

@@ -8,7 +8,7 @@
         <result column="wh_description" property="wh_description" jdbcType="VARCHAR" />
         <result column="wh_statuscode" property="wh_statuscode" jdbcType="VARCHAR" />
         <result column="wh_status" property="wh_status" jdbcType="TIMESTAMP" />
-        <result column="wh_recordid" property="wh_recordid" jdbcType="INTEGER" />
+        <result column="wh_recordid" property="wh_recorderid" jdbcType="INTEGER" />
         <result column="wh_recorder" property="wh_recorder" jdbcType="INTEGER" />
         <result column="wh_date" property="wh_date" jdbcType="INTEGER" />
         <result column="companyId" property="companyId" jdbcType="INTEGER" />
@@ -316,7 +316,7 @@
         select count(*) from WAREHOUSE where WH_CODE = #{code} and WH_ID != #{id} and companyId =#{companyId}
     </select>
 
-    <select id="selectWarehouseListByCondition">
+    <select id="selectWarehouseListByCondition" resultMap="WarehouseResultMapper">
         select  *  from warehouse
         <where>
             <if test="con != null">