Jenkins自动合并

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<String, Object> customFields = new HashMap<>();
+    @Lob
+    @FieldAnnotation(property = false)
+    private HashMap<String, Object> customFields = new HashMap<>();
 
     @Column(name="KEY")
     @ApiParam(value ="主键值")

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;

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;