From 6534aeb7d0f8bf1541140645d161ffade21b3fbc Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 17 九月 2025 14:37:16 +0800
Subject: [PATCH] Merge branch 'feature_asset'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/AssetMain.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetMain.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetMain.java
index 325f511..8be23d1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetMain.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetMain.java
@@ -64,7 +64,7 @@
@ApiModelProperty(value = "资产主类型：0-通用资产，1-房产资产，2-车辆资产")
@TableField("asset_main_type")
- private Boolean assetMainType;
+ private Integer assetMainType;
@ApiModelProperty(value = "计量单位")
@TableField("measurement_unit")
--
Gitblit v1.7.1