diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java index 3935866..aa07354 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java @@ -32,7 +32,7 @@ public class DataLink extends BaseAPS { @Column(name="TYPE") @ApiParam(value ="链接类型") - @FieldAnnotation(defaultValue = "CSV") + @FieldAnnotation(defaultValue = "EXCEL") private ApsEnumUtil.DATA_LINK_TYPE type; @Column(name="PATH") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java index 272f6d3..5ffa2de 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.aps.bean; -import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -26,17 +25,14 @@ import javax.persistence.Table; public class ExpressionRecord extends BaseAPS { @Column(name="BEAN_NAME") @ApiParam(value ="表名") - @FieldAnnotation(property = false) private String beanName; @Column(name="FIELD_NAME") @ApiParam(value ="字段名") - @FieldAnnotation(property = false) private String fieldName; @Column(name="NAME") @ApiParam(value ="名称") - @FieldAnnotation(notEmpty = true) private String name; @Column(name="EXPRESSION") diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index de9a06f..0d23467 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -979,7 +979,7 @@ public class ApsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_LINK_TYPE { - EXCEL("EXCEL", "EXCEL文件"), + EXCEL("EXCEL", "EXCEL"), MYSQL("MYSQL", "MySql"), ORACLE("ORACLE", "Oracle"), SQLSERVER("SQLSERVER", "SqlServer");