Merge remote-tracking branch 'origin/master'

maven

22 小时以前 9fb6f5adf9f63deffd377c001aaab8ffeae4c742

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

@@ -13,8 +13,12 @@
        pm.model AS product_model,
        pl.purchase_contract_number,
        pl.supplier_name,
        pl.project_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