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

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -3527,6 +3527,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				e.setUnloadAbnormal(isAbnormal);
 				e.setUnloadNum(1);
 				e.setUnloadUserName(nickName);
+				e.setUnloadTime(new Date());
 				e.setRemark(remark);
 				updateScanEntityList.add(e);
 
@@ -3652,6 +3653,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					p.setUnloadAbnormal(isAbnormal);
 					p.setUnloadNum(1);
 					p.setUnloadUserName(nickName);
+					p.setUnloadTime(new Date());
 					updateScanEntityList.add(p);
 
 
@@ -3759,6 +3761,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 						p.setUnloadAbnormal(isAbnormal);
 						p.setUnloadNum(1);
 						p.setUnloadUserName(nickName);
+						p.setUnloadTime(new Date());
 						p.setRemark(remark);
 						updateScanEntityList.add(p);