Merge remote-tracking branch 'origin/dev' into _dev/caifc

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeDoMapper.xml

@@ -266,7 +266,7 @@ CASE
 	th.f_destportid AS fDestportid,
 	tre.f_name AS fLoadPortName,
 	ts.f_name AS fDestPortName,
-	tw.src_bill_no AS srcBillNo,
+	tw.f_mblno AS srcBillNo,
 	c.f_name AS fName,
 	tn.f_name AS cntrName,
 	ti.f_cntrcount AS fCntrCount,

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -2055,7 +2055,7 @@
     t.f_id AS fSrcpid,
     w.f_corpid AS fCorpid,
     w.fName AS fName,
-    w.f_mblno AS fMblno,
+    t.f_mblno AS fMblno,
     w.f_bsdate AS fBsdate,
     t.f_billtype AS fBilltype,
     t.f_review_date AS fReviewDate,