From 291a72bf35e2d39b816abc0ebf085cfa9da3ee06 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 23 九月 2025 14:11:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationStorage.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationStorage.java
index 48e21a7..f27e671 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationStorage.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationStorage.java
@@ -46,7 +46,7 @@
 
     @ApiModelProperty(value = "入库类型 0-正常入库")
     @TableField("storage_type")
-    private Boolean storageType;
+    private Integer storageType;
 
     @ApiModelProperty(value = "入库日期")
     @TableField("storage_time")

--
Gitblit v1.7.1