解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvPointVarCentralValue.java

 package com.yeejoin.amos.boot.module.jxiop.biz.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
@@ -27,7 +29,7 @@ public class IdxBizPvPointVarCentralValue{
     /**
      * 
      */
-	@TableField("SEQUENCE_NBR")
+	@TableId(value = "SEQUENCE_NBR" ,type = IdType.UUID)
     private String sequenceNbr;
 
     /**

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvPointVarCorrelation.java

@@ -71,13 +71,13 @@ public class IdxBizPvPointVarCorrelation{
      * 
      */
 	@TableField("ANALYSIS_POINT_ID")
-    private Integer analysisPointId;
+    private String analysisPointId;
 
     /**
      * 
      */
 	@TableField("PROCESS_POINT_ID")
-    private Integer processPointId;
+    private String processPointId;
 
     /**
      * 片区
@@ -131,7 +131,7 @@ public class IdxBizPvPointVarCorrelation{
      * 
      */
 	@TableField("PROCESS_INDEX_ADDRESS")
-    private Integer processIndexAddress;
+    private String processIndexAddress;
 
     /**
      * 设备名称