From 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 16:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java b/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java
index f9403d5..780246a 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java
@@ -6,7 +6,7 @@
import java.time.LocalDateTime;
import java.util.Date;
-import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
@@ -15,7 +15,7 @@
*/
@TableName(value ="warehouse")
@Data
-@ApiModel
+@Schema
public class Warehouse implements Serializable {
/**
*
--
Gitblit v1.9.3