Skip to content

Y
yichengstreet-be
Commit 7d90d38e authored by luben's avatar luben
Browse files
Options

Merge branch 'dev' into 'main' 

Dev

See merge request !25
parents fd7e5cf0 e967d383
Pipeline #142903 passed with stages
        in 3 minutes and 28 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 2 additions and 2 deletions
        ruoyi-system/src/main/resources/mapper/grid/GridCompanyEconomyInfoMapper.xml
        View file @ 7d90d38e
        ......@@ -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}
        ......
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment