Merge branch 'dev-lx' into dev

ruoyi-system/src/main/resources/mapper/house/BusinessEntitySellMapper.xml

@@ -28,7 +28,7 @@
     <update id="updateBusinessEntitySell" parameterType="com.ruoyi.system.domain.house.BusinessEntitySell">
         UPDATE business_entity_sell
         <set>
-            <if test="BusinessEntityInfoId != null">business_entity_info_id=#{businessEntityInfoId},</if>
+            <if test="businessEntityInfoId != null">business_entity_info_id=#{businessEntityInfoId},</if>
             <if test="year != null">year=#{year},</if>
             <if test="yearSell != null">year_sell=#{yearSell},</if>
             <if test="yearTax != null">year_tax=#{yearTax},</if>
@@ -59,4 +59,4 @@
             resultType="com.ruoyi.system.domain.house.BusinessEntitySell">
         SELECT * FROM business_entity_sell WHERE business_entity_info_id in <foreach collection="entityIds" item="entityId" open="(" close=")" separator=",">#{entityId}</foreach>
     </select>
-</mapper>
\ No newline at end of file
+</mapper>