Merge remote-tracking branch 'origin/master'

sinake

4 天以前 ee089a8ac4a9d99ef0a0491bbf1d80a2d4fbc393

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

@@ -37,6 +37,9 @@
        <result property="amount" column="Amount"/>
        <result property="taxamount" column="TaxAmount"/>
        <result property="taxedamount" column="TaxedAmount"/>
        <result property="vatAmount" column="vat_amount"/>
        <result property="cityTaxAmount" column="city_tax_amount"/>
        <result property="laborPretaxAmount" column="labor_pretax_amount"/>
        <result property="prepaidamount" column="PrepaidAmount"/>
        <result property="paidamount" column="paidAmount"/>
        <result property="paidtime" column="paidTime"/>
@@ -96,6 +99,9 @@
               Amount,
               TaxAmount,
               TaxedAmount,
               vat_amount,
               city_tax_amount,
               labor_pretax_amount,
               PrepaidAmount,
               paidAmount,
               paidTime,