diff --git a/pom.xml b/pom.xml index ebcee7467187dbb2703ce99025652575cf7e3f4a..518b60515fb84baec180237600e34d752dea0dc1 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 0.1.0 0.1.7 0.3.4 - 0.1.2 + 0.1.5 0.1.0 0.1.1 0.1.0 @@ -70,18 +70,23 @@ com.inspur.edp - cef-designtime-api - ${cef.designtime.version} + business-entity-model + ${bef-entity-model.version} com.inspur.edp - das-commonmodel - ${das.commonmodel.designtime.version} + unified-datatype-model + ${bef-entity-model.version} com.inspur.edp - bef-bizentity - ${bef.designtime.version} + common-entity-model + ${bef-entity-model.version} + + + com.inspur.edp + common-model + ${bef-entity-model.version} com.inspur.edp @@ -117,21 +122,11 @@ caf-caching ${caf-caching.version} - - com.inspur.edp - common-model - ${common-model.version} - com.inspur.edp common-entity-variable-generator ${common-variable-generator.version} - - com.inspur.edp - business-entity-model - ${bef-entity-model.version} - com.inspur.edp lcm-logging-service diff --git a/view-object-manager/pom.xml b/view-object-manager/pom.xml index 47967bcc3a6c34798dcfc48e0965b1b9eec00b65..ac30806875e1150a25afa21ed72341aa09af7b39 100644 --- a/view-object-manager/pom.xml +++ b/view-object-manager/pom.xml @@ -44,6 +44,10 @@ compile ${project.version} + + com.inspur.edp + common-model + com.inspur.edp runtime-customize-api diff --git a/view-object-model/pom.xml b/view-object-model/pom.xml index c2d4ef5bb3b591248ceb53992e959f1f17c89be2..e93c87d78d87e1cbf16171a536470fbd89b97466 100644 --- a/view-object-model/pom.xml +++ b/view-object-model/pom.xml @@ -67,7 +67,7 @@ com.inspur.edp - cef-designtime-api + business-entity-model com.inspur.edp @@ -116,8 +116,7 @@ com.inspur.edp - udt-designtime-api - 0.1.7 + unified-datatype-model com.inspur.edp diff --git a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/extendinfo/entity/GspVoExtendInfoEntity.java b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/extendinfo/entity/GspVoExtendInfoEntity.java index 5071664f972168f4a1ca284f2e8ecba7065634b0..f22e47fb203ea84524da5a79975a5ed24d0c2189 100644 --- a/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/extendinfo/entity/GspVoExtendInfoEntity.java +++ b/view-object-model/src/main/java/com/inspur/edp/formserver/viewmodel/extendinfo/entity/GspVoExtendInfoEntity.java @@ -3,6 +3,7 @@ package com.inspur.edp.formserver.viewmodel.extendinfo.entity; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import lombok.NoArgsConstructor; +import org.hibernate.annotations.Nationalized; import javax.persistence.Entity; import javax.persistence.Id; @@ -52,8 +53,10 @@ public class GspVoExtendInfoEntity { private String id; private String extendInfo; private String configId; + @Nationalized private String createdBy; private Date createdOn; + @Nationalized private String lastChangedBy; private Date lastChangedOn; private String beSourceId;