From 414b8118716e63b5505403ad6b0354999b06c8ce Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 4 Jun 2020 17:01:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 5 +++++ sonar-project.properties | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index b8ed589..49cf675 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -16,6 +16,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.lang.reflect.Method; import java.sql.JDBCType; @@ -122,11 +123,15 @@ public class FieldInfo extends BaseAPS { private Boolean notEmpty; @JsonIgnore + @Transient private transient Class clazz; @JsonIgnore + @Transient private transient Class typeClass; @JsonIgnore + @Transient private transient Method getMethod; @JsonIgnore + @Transient private transient Method setMethod; } diff --git a/sonar-project.properties b/sonar-project.properties index 3428e74..55e4e84 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-PROD-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From b946ca7fa1e16c4e5bc04e4cbece654c9ea080f9 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 4 Jun 2020 19:45:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A2066=EF=BC=8C?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9C=BA=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java | 2 +- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java index a71f88e..ceaea06 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonRouteStatusErrorRecord.java @@ -40,7 +40,7 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl public String andonOrderNo; @Column(name = "ERROR_DESC") - @ApiParam(value = "失败描述") + @ApiParam(value = "异常描述") public String errorDesc; @Column(name = "WORK_CENTER_CODE") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java index cc36903..4e4d276 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java @@ -42,7 +42,7 @@ public class PtlRouteStatusErrorRecord extends BaseBean implements Serializable private String taskNo; @Column(name = "ERROR_DESC") - @ApiParam(value = "失败描述") + @ApiParam(value = "异常描述") public String errorDesc; @Column(name = "AREA_NO")