Browse Source

Merge remote-tracking branch 'origin/develop' into develop

linhuili 3 years ago
parent
commit
ca78825a20

+ 5 - 4
dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/digital/entity/ObjectRelationProjectCal.java

@@ -2,6 +2,7 @@ package com.persagy.dmp.digital.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.persagy.dmp.common.model.entity.AuditableEntity;
 import lombok.*;
 
@@ -11,7 +12,7 @@ import java.util.Set;
  * 
  * @TableName relation_project_cal
  */
-@TableName(value ="dt_relation_project_cal")
+@TableName(value ="dt_relation_project_cal",autoResultMap = true)
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -41,13 +42,13 @@ public class ObjectRelationProjectCal extends AuditableEntity {
      * 是否需要配置源末端
      */
     @TableField(value = "source_flag")
-    private Integer sourceFlag;
+    private Boolean sourceFlag;
 
     /**
      * 是否自动计算类型
      */
     @TableField(value = "automatic_flag")
-    private Integer automaticFlag;
+    private Boolean automaticFlag;
 
     /**
      * 手动计算类型 1 禁用  2提示引导 3手动维护
@@ -106,7 +107,7 @@ public class ObjectRelationProjectCal extends AuditableEntity {
     /**
      * 机电系统类型
      */
-    @TableField(value = "mep_system_type")
+    @TableField(value = "mep_system_type",typeHandler = JacksonTypeHandler.class)
     private Set<String> mepSystemType;
 
     @TableField(exist = false)