Merge remote-tracking branch 'origin/release' into release

dxhy-core/src/main/resources/mapper/BbfpzhslMapper.xml

@@ -25,10 +25,9 @@
         tdis.tax_rate taxRate,
         t.inaccount_status
         from t_dx_record_invoice t
-        left join t_dx_record_invoice_statistics tdis
+        left join dxhy_detail.t_dx_record_invoice_detail tdis
         <!--on t.invoice_code = tdis.invoice_code and t.invoice_no = tdis.invoice_no-->
-        on  t.invoice_no = tdis.invoice_no
+        on  t.uuid = tdis.uuid
-        and t.invoice_code = tdis.invoice_code
         where
         t.invoice_date between #{kpksrq} and #{kpjsrq}
         and t.company = #{company}