From 68fc275565ff4b973b497d7b42449aaff34fbf0e Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 8 Jan 2020 09:54:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E6=8B=96=E6=8B=BD=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/common/BaseAPS.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index 18d4ace..26e9d6c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -8,10 +8,10 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Column; +import javax.persistence.Lob; import javax.persistence.MappedSuperclass; import javax.persistence.Transient; import java.util.HashMap; -import java.util.Map; /** * @Description :APS基类 @@ -26,7 +26,9 @@ import java.util.Map; @ExcludeImportExport public abstract class BaseAPS extends BaseBean { @JsonIgnore - private transient Map customFields = new HashMap<>(); + @Lob + @FieldAnnotation(property = false) + private HashMap customFields = new HashMap<>(); @Column(name="KEY") @ApiParam(value ="主键值") From b0f60a9176fa8da0a2e02c3ff6a893911f31984c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 8 Jan 2020 10:04:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?2020-01-08=E5=88=9B=E5=BB=BA=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E5=88=97=E8=A1=A8=E4=B8=8E=E6=9F=A5=E8=AF=A2model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms}/WmsListElementModel.java | 2 +- .../java/cn/estsh/i3plus/pojo/model/wms}/WmsSearchElementModel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename modules/{i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean => i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms}/WmsListElementModel.java (96%) rename modules/{i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean => i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms}/WmsSearchElementModel.java (96%) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java similarity index 96% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java index 1c2eb95..a286a2e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.modelbean; +package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java similarity index 96% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java index b9a1224..b785f96 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.modelbean; +package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api;