Merge remote-tracking branch 'origin/master'

liyong

昨天 f02b5af51f2fcfaae5b04e4c12078ec0da578f7e

 src/main/resources/mapper/purchase/ProductRecordMapper.xml

@@ -15,6 +15,9 @@
        pl.supplier_name,
        pr.*,
        tr.invoice_number,
        tr.iss_uer_id,
        tr.iss_uer,
        tr.id as ticketRegistrationId,
        ROUND(pr.tickets_amount/(1+pr.tax_rate/100),2 ) as un_tickets_price,
        ROUND(pr.tickets_amount-pr.tickets_amount/(1+pr.tax_rate/100),2 )as invoice_amount
        FROM product_record pr