From fe3c3070639f079c9cbaf095039dad1f2de16835 Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Tue, 1 Jul 2025 17:12:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/demo/domain/DeviceInfo.java | 16 ++++++++++++---- .../org/dromara/demo/domain/vo/DeviceInfoVo.java | 2 ++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/DeviceInfo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/DeviceInfo.java index 8f168ba..b248292 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/DeviceInfo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/DeviceInfo.java @@ -1,14 +1,17 @@ package org.dromara.demo.domain; -import org.dromara.common.tenant.core.TenantEntity; -import com.baomidou.mybatisplus.annotation.*; +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 com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.common.tenant.core.TenantEntity; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; +import java.util.Date; /** * 设备信息对象 device_info @@ -70,6 +73,11 @@ public class DeviceInfo extends TenantEntity { */ private String testSubstance; + /** + * 监理公司 + */ + private String superviseCompany; + /** * 状态 */ diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/DeviceInfoVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/DeviceInfoVo.java index 4834c12..6d28a21 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/DeviceInfoVo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/DeviceInfoVo.java @@ -94,5 +94,7 @@ public class DeviceInfoVo implements Serializable { @ExcelProperty(value = "状态") private String status; + @ExcelProperty(value = "监理公司") + private String superviseCompany; }