From 430477c7e0777531f22fc18dc8906ea75cdc21d9 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期三, 03 十二月 2025 16:53:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
multi-system/src/main/java/com/gkhy/exam/system/domain/StandingBook.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/domain/StandingBook.java b/multi-system/src/main/java/com/gkhy/exam/system/domain/StandingBook.java
index 33503e7..0c6422e 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/domain/StandingBook.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/domain/StandingBook.java
@@ -47,17 +47,27 @@
@TableField(exist = false)
private String deptName;
- @ApiModelProperty("名称型号")
+ @ApiModelProperty("名称")
+ @TableField("name")
+ @NotBlank(message = "名称不能为空")
+ private String name;
+
+
+ @ApiModelProperty("型号")
@TableField("model")
- @NotBlank(message = "名称型号不能为空")
+ @NotBlank(message = "型号不能为空")
private String model;
@ApiModelProperty("责任人/使用人")
@TableField("person_responsible")
- @NotBlank(message = "责任人/使用人不能为空")
+ @NotNull(message = "责任人/使用人不能为空")
private Long personResponsible;
- @ApiModelProperty("设备类型1生成设备2办公自动化设备")
+ @ApiModelProperty(value = "责任人/使用人名称")
+ @TableField(exist = false)
+ private String personResponsibleName;
+
+ @ApiModelProperty("设备类型1计算机设备2办公自动化设备3外部设备4其他5生产设备")
@TableField("device_type")
@NotNull(message = "设备类型不能为空")
private Integer deviceType;
@@ -75,7 +85,7 @@
@TableField("confidentiality")
private String confidentiality;
- @ApiModelProperty("状态1.完好2损坏")
+ @ApiModelProperty("状态1.完好2需整改3损坏")
@TableField("status")
private Integer status;
@@ -88,8 +98,8 @@
private String location;
@ApiModelProperty("使用情况")
- @TableField("usage")
- private String usage;
+ @TableField("used")
+ private String used;
@ApiModelProperty("备注")
@TableField("remark")
--
Gitblit v1.9.2