Merge remote-tracking branch 'origin/master'

sinake

4 天以前 ee089a8ac4a9d99ef0a0491bbf1d80a2d4fbc393

 ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml

@@ -51,6 +51,10 @@
        <result property="uploadtime" column="uploadtime"/>
        <result property="flowlevel" column="FlowLevel"/>
        <result property="pretaxcost" column="PretaxCost"/>
        <result property="vatCost" column="vat_cost"/>
        <result property="cityTaxCost" column="city_tax_cost"/>
        <result property="laborPretaxCost" column="labor_pretax_cost"/>
        <result property="taxVersion" column="tax_version"/>
        <result property="taxedcost" column="TaxedCost"/>
        <result property="backflowlevel" column="backFlowLevel"/>
        <result property="zffs" column="zffs"/>
@@ -87,6 +91,10 @@
               UnitNo,
               UnitUserNo,
               PretaxCost,
               vat_cost,
               city_tax_cost,
               labor_pretax_cost,
               tax_version,
               TaxedCost,
               Phone,
               AnnexBankCard,