From 5400950ecc23a3222a9633637a57b068f114ce26 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 31 十月 2024 18:20:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/vo/DaPointExcelVO.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/vo/DaPointExcelVO.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/vo/DaPointExcelVO.java
index 80040d0..9e236f0 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/vo/DaPointExcelVO.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/vo/DaPointExcelVO.java
@@ -29,10 +29,6 @@
@ExcelProperty("数据类型")
private String dataType;
- @Schema(description = "值类型")
- @ExcelProperty("值类型")
- private String valueType;
-
@Schema(description = "存储类型")
@ExcelProperty("存储类型")
private String storeType;
@@ -77,6 +73,14 @@
@ExcelProperty("测点Tag")
private String tagNo;
+ @Schema(description = "平滑尺度")
+ @ExcelProperty("平滑尺度")
+ private Integer dimension;
+
+ @Schema(description = "值类型")
+ @ExcelProperty("值类型")
+ private String valueType;
+
@Schema(description = "计算公式")
@ExcelProperty("计算公式")
private String expression;
--
Gitblit v1.9.3