Merge remote-tracking branch 'origin/master'

@@ -30,6 +30,11 @@
             <artifactId>jackson-annotations</artifactId>
             <artifactId>jackson-annotations</artifactId>
             <version>2.10.5</version>
             <version>2.10.5</version>
         </dependency>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>5.3.1</version>
+        </dependency>
     </dependencies>
     </dependencies>
     <build>
     <build>
         <plugins>
         <plugins>

@@ -2,6 +2,7 @@ package com.sunyo.wlpt.base.model;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
@@ -21,6 +22,7 @@ public class NMMS_CUSTOM_MT1201 {
     private String customcode;
     private String customcode;
 
 
     private String goodsname;
     private String goodsname;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date actime;
     private Date actime;