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/AssetRepairRecord.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetRepairRecord.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetRepairRecord.java
index ce2dca4..5a85874 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetRepairRecord.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetRepairRecord.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;
@@ -55,7 +56,7 @@
@ApiModelProperty(value = "维修资产类型ID")
@TableField("asset_type_id")
- private String assetTypeId;
+ private Integer assetTypeId;
@ApiModelProperty(value = "维修备注")
@TableField("repair_remarks")
@@ -91,6 +92,7 @@
@ApiModelProperty(value = "是否删除 0-否，1-是")
@TableField("disabled")
+ @TableLogic
private Boolean disabled;
--
Gitblit v1.7.1