Merge branch 'dev-lb' into 'dev'

Dev lb

See merge request !24

ruoyi-system/src/main/resources/mapper/grid/GridCompanyEconomyInfoMapper.xml

@@ -265,10 +265,10 @@
         create_time = #{createTime,jdbcType=VARCHAR},
       </if>
       <if test="record.yearSales != null">
-        year_sales = #{record.yearSales,jdbcType=VARCHAR},
+        year_sales = #{yearSales,jdbcType=VARCHAR},
       </if>
       <if test="record.createTime != null">
-        year_taxes = #{record.yearTaxes,jdbcType=VARCHAR},
+        year_taxes = #{yearTaxes,jdbcType=VARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}