From 0b62b61eaba22186417e8171c86ecf6e20d1def1 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 21 四月 2025 17:49:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingTraceConfEntity.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingTraceConfEntity.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingTraceConfEntity.java
index db7f0f2..5a155c0 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingTraceConfEntity.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingTraceConfEntity.java
@@ -1,5 +1,7 @@
 package com.iailab.module.ansteel.coking.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -15,18 +17,24 @@
 @TableName("t_coking_trace_conf")
 public class CokingTraceConfEntity {
 
-    /**
-     * id
-     */
+    @TableId(type = IdType.ASSIGN_UUID)
 	private String id;
     /**
      * 信息类型(0:生产情况,1:能源发生,2:能源消耗)
      */
 	private String infoType;
     /**
-     * 指标类型(prod_day,main,child)
+     * 指标类型
      */
-	private String indType;
+    private String indType;
+    /**
+     * 数据类型(测点,指标)
+     */
+	private String dataType;
+    /**
+     * 测点编码
+     */
+    private String pointNo;
     /**
      * 指标编码
      */

--
Gitblit v1.9.3