From baed9b68c8cb6b693d3c010f039d2c55bf242e0e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 十月 2025 18:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/AssetHouseInspectionRecord.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetHouseInspectionRecord.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetHouseInspectionRecord.java
index caeb443..343158e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetHouseInspectionRecord.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/AssetHouseInspectionRecord.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;
@@ -36,6 +37,9 @@
@ApiModelProperty(value = "资产主表ID，关联asset_main表")
@TableField("asset_main_id")
private Integer assetMainId;
+ @ApiModelProperty(value = "巡检人id")
+ @TableField("inspection_id")
+ private Integer inspectionId;
@ApiModelProperty(value = "资产编号（冗余字段）")
@TableField("asset_code")
@@ -53,17 +57,17 @@
@TableField("inspection_date")
private LocalDate inspectionDate;
- @ApiModelProperty(value = "房屋关闭情况：1-正常、0-异常")
+ @ApiModelProperty(value = "新增不传 列表使用 房屋关闭情况 ")
@TableField("house_close_status")
- private Boolean houseCloseStatus;
+ private String houseCloseStatus;
- @ApiModelProperty(value = "水电气关闭情况：1-正常、0-异常")
+ @ApiModelProperty(value = "新增不传 列表使用 水电气关闭情况 ")
@TableField("water_electronic_gas_close_status")
- private Boolean waterElectronicGasCloseStatus;
+ private String waterElectronicGasCloseStatus;
- @ApiModelProperty(value = "内部情况：1-正常、0-异常")
+ @ApiModelProperty(value = "新增不传 列表使用 内部情况 ")
@TableField("inner_status")
- private Boolean innerStatus;
+ private String innerStatus;
@ApiModelProperty(value = "巡检备注")
@TableField("remarks")
@@ -87,6 +91,7 @@
@ApiModelProperty(value = "是否删除 0-否，1-是")
@TableField("disabled")
+ @TableLogic
private Boolean disabled;
--
Gitblit v1.7.1