From 652db871507244a5838fc6b36d9b9771b527ad61 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 25 九月 2025 11:56:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/emums/ApprovalTypeEnum.java b/ruoyi-system/src/main/java/com/ruoyi/system/emums/ApprovalTypeEnum.java
index 9adf171..4970abf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/emums/ApprovalTypeEnum.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/emums/ApprovalTypeEnum.java
@@ -12,7 +12,7 @@
 	PURCHASE(5, "采购申请"),
 	IN_STOCK(6, "资产入库"),
 	GRAB(7, "物品领用"),
-	BURROW(8, "物品借用"),
+	BORROW(8, "物品借用"),
 	RETURN(9, "借用归还"),
 	ASSET_DISPOSE(10, "资产处置"),
 	ASSET_CHANGE(11, "资产表更"),

--
Gitblit v1.7.1