From 0d1a73f4c0d35951dc42f0e35526d69c0e922afc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 17 十月 2025 15:00:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/AssetPropertyExt.java | 6 ++++--
1 files changed, 4 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 e0c1bb0..f01c246 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -82,9 +83,9 @@
@TableField("resettlement_situation")
private String resettlementSituation;
- @ApiModelProperty(value = "是否抵押：0-否，1-是")
+ @ApiModelProperty(value = "是否抵押：否，是")
@TableField("is_mortgaged")
- private Boolean isMortgaged;
+ private String mortgaged;
@ApiModelProperty(value = "承租方")
@TableField("tenant_name")
@@ -120,6 +121,7 @@
@ApiModelProperty(value = "是否删除 0-否，1-是")
@TableField("disabled")
+ @TableLogic
private Boolean disabled;
--
Gitblit v1.7.1