代码合并问题解决

performance-web/src/main/java/com/clx/performance/model/OrderGoods.java

@@ -132,10 +132,6 @@ public class OrderGoods implements HasKey<Integer> {
     private LocalDateTime lastLoadTime;
 
 
-    @TableField("last_arrive_receive_time")
-    @ApiModelProperty("'最晚到达目的地时间'")
-    private LocalDateTime lastArriveReceiveTime;
-
 
     @TableField("pending_order_time")
     @ApiModelProperty("挂单时间")