From 146edfb05602373ad5b36771e1ede1e395d8ab62 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 27 二月 2025 14:53:26 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_cr

---
 inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrderStandardTemplate.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrderStandardTemplate.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrderStandardTemplate.java
index 921d222..e682cf6 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrderStandardTemplate.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrderStandardTemplate.java
@@ -4,6 +4,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -44,11 +45,11 @@
 
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty("鍒涘缓鏃堕棿")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @ApiModelProperty("淇敼鏃堕棿")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     @ApiModelProperty("妯℃澘缂栧彿")
     private String number;

--
Gitblit v1.9.3