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

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderService.java

@@ -2188,7 +2188,7 @@ public class KwtWaybillOrderService {
         result.put("unloadCreateByName", usersMap.get(unloadTicket.getUpdateBy()));
         result.put("unloadCityName", unloadAddress != null ? unloadAddress.getCityName() : null);
         result.put("unloadDetailAddress", unloadAddress != null ? unloadAddress.getDetailAddress() : null);
-        result.put("approvalTime", track != null ? track.getCreateTime() : null);
+        result.put("approvalTime", track != null ? DateUtils.formatV1(track.getCreateTime()) : null);
         result.put("approvalOpinions", track != null ? track.getRemark() : null);
         result.put("approver", usersMap.get(track != null ? track.getUpdateBy() : null));
         return HttpResult.ok(result);

sckw-modules/sckw-transport/src/main/resources/mapper/KwtWaybillOrderMapper.xml

@@ -471,7 +471,7 @@
             ORDER BY wo.start_time
         </if>
         <if test="busStatus != null and busStatus == 4">
-            ORDER BY wo.create_time desc
+            ORDER BY wo.update_time desc
         </if>
     </select>