From 87c1e76403b09b137ad07abd75350a4b4cc23694 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 28 九月 2025 16:22:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/dto/clinicWarehouseGoodsDto.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/clinicWarehouseGoodsDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/clinicWarehouseGoodsDto.java
index 4f83f55..eadd00e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/clinicWarehouseGoodsDto.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/clinicWarehouseGoodsDto.java
@@ -7,6 +7,7 @@
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data
@@ -31,14 +32,14 @@
 
     @ApiModelProperty(value = "生产日期")
     @NotNull(message = "生产日期不能为空")
-    private LocalDateTime productionDate;
+    private LocalDate productionDate;
 
     @ApiModelProperty(value = "有效日期")
     @NotNull(message = "有效日期不能为空")
-    private LocalDateTime expiryDate;
+    private LocalDate expiryDate;
 
     @ApiModelProperty(value = "供应商id")
-    @NotBlank(message = "供应商id不能为空")
+//    @NotBlank(message = "供应商id不能为空")
     private String supplierId;
 
 }

--
Gitblit v1.7.1