From 6b42a5bbabf8b653184f273f1981690dedd06f04 Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Mon, 1 Jul 2024 15:45:22 +0800
Subject: [PATCH] 2024/06/28

---
 src/main/java/com/spring/modules/shipment/entity/Shipment.java | 2 ++
 src/main/resources/mapper/production/ShopOrderMapper.xml       | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/main/java/com/spring/modules/shipment/entity/Shipment.java b/src/main/java/com/spring/modules/shipment/entity/Shipment.java
index 957def3..0f26410 100644
--- a/src/main/java/com/spring/modules/shipment/entity/Shipment.java
+++ b/src/main/java/com/spring/modules/shipment/entity/Shipment.java
@@ -1,5 +1,6 @@
 package com.spring.modules.shipment.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -23,6 +24,7 @@ public class Shipment {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date shipDate;
 
+    @TableField(exist = false)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createDate;
diff --git a/src/main/resources/mapper/production/ShopOrderMapper.xml b/src/main/resources/mapper/production/ShopOrderMapper.xml
index f244599..cca453d 100644
--- a/src/main/resources/mapper/production/ShopOrderMapper.xml
+++ b/src/main/resources/mapper/production/ShopOrderMapper.xml
@@ -107,6 +107,7 @@
                 and #{params.endDate} >= so.PlanStartDate
             </if>
         </where>
+        order by EnterDate desc
     </select>
 
     <delete id="autoNewRouting">