From 692153c7d77721a6ec4e64c4d9ed0dface433c6e Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 24 九月 2024 08:50:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/vo/IndItemSaveReqVO.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/vo/IndItemSaveReqVO.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/vo/IndItemSaveReqVO.java
index 7b345a5..f8842d2 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/vo/IndItemSaveReqVO.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/item/vo/IndItemSaveReqVO.java
@@ -4,6 +4,7 @@
import lombok.Data;
import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
/**
* @author PanZhibao
@@ -20,7 +21,7 @@
/**
* 指标编码
*/
- @Schema(description = "名称")
+ @Schema(description = "编码")
private String itemNo;
/**
@@ -33,50 +34,56 @@
/**
* 指标类型
*/
- @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "名称不能为空")
+ @Schema(description = "指标类型", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "指标类型不能为空")
private String itemType;
/**
* 指标分类
*/
- @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "名称不能为空")
+ @Schema(description = "指标分类", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "指标分类不能为空")
private String itemCategory;
/**
* 转换系数
*/
- @Schema(description = "名称")
- private Boolean coefficient;
+ @Schema(description = "系数")
+ private BigDecimal coefficient;
/**
* 指标精度
*/
- @Schema(description = "名称")
+ @Schema(description = "指标精度")
private Integer precision;
/**
* 时间粒度
*/
- @Schema(description = "名称")
+ @Schema(description = "时间粒度")
private String timeGranularity;
/**
* 数量单位
*/
- @Schema(description = "名称")
+ @Schema(description = "数量单位")
private String unit;
/**
* 备注
*/
- @Schema(description = "名称")
+ @Schema(description = "备注")
private String remark;
/**
* 状态
*/
- @Schema(description = "名称")
+ @Schema(description = "状态（0正常 1停用）")
private Integer status;
+
+ private IndItemAtomVo atomItem;
+
+ private IndItemDerVo derItem;
+
+ private IndItemCalVo calItem;
}
\ No newline at end of file
--
Gitblit v1.9.3