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

8 months ago · b66a41fd0c
1 changed files with 4 additions and 4 deletions
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
@ -239,10 +239,10 @@
            ltad.weight weight,
            ltad.volume volume,
            ltad.send_date_str sendDateStr,
-            ltcls.load_code trunklineCarsNo,
-            ltcls.scan_status scanStatus,
-            ltcls.create_time trunklineLoadingTime,
-            ltcls.sign_time trunklineSignTime,
+            m.load_code trunklineCarsNo,
+            m.scan_status scanStatus,
+            m.create_time trunklineLoadingTime,
+            m.sign_time trunklineSignTime,
            lddl.train_number deliveryTrainNumber,
            ldl.scan_time deliveryLoadingTime,
            ldl.signing_time deliverySignTime,