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/AssetPropertyExt.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetPropertyExt.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetPropertyExt.java
index 74c5526..5da51a5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetPropertyExt.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetPropertyExt.java
@@ -82,9 +82,9 @@
@TableField("resettlement_situation")
private String resettlementSituation;
- @ApiModelProperty(value = "是否抵押：0-否，1-是")
+ @ApiModelProperty(value = "是否抵押：否，是")
@TableField("is_mortgaged")
- private Integer mortgaged;
+ private String mortgaged;
@ApiModelProperty(value = "承租方")
@TableField("tenant_name")
--
Gitblit v1.7.1