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

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

@@ -105,9 +105,11 @@ public class KwtWaybillOrderTicketService {
                 //对比是否存在更新
                 if (oldTicket != null && oldTicket.getAmount().doubleValue() == ticket.getAmount().doubleValue()
                         && oldTicket.getUrls().equals(urls)
-                        && oldTicket.getOperateTime() == operateTime) {
+                        && oldTicket.getOperateTime().compareTo(operateTime)== 0 )  {
                     continue;
                 }
+
+
                 //删除
                 oldTicket.setDelFlag(Global.YES);
                 waybillOrderTicketMapper.updateById(oldTicket);