From 2e5ec4c7c528437a20fd7212096dedd26ed0f5cd Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 02 九月 2025 15:36:09 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousingBatch.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousingBatch.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousingBatch.java
index a25bb39..a5d2717 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousingBatch.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousingBatch.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -45,10 +46,12 @@
     private String batchNumber;
 
     @ApiModelProperty(value = "生产日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("production_date")
     private LocalDateTime productionDate;
 
     @ApiModelProperty(value = "有效日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("expiry_date")
     private LocalDateTime expiryDate;
 

--
Gitblit v1.7.1