From 4d8652f206e9af1aa4f2085f576d218b28c13d8d Mon Sep 17 00:00:00 2001
From: wangmaojian <wangmaojian@inspur.com>
Date: Thu, 8 Aug 2024 10:09:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?nvarchar=E5=AD=97=E6=AE=B5=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 20 ++++++++++++-------
 view-object-manager/pom.xml                   |  8 ++++----
 view-object-model/pom.xml                     |  5 ++---
 .../entity/GspVoExtendInfoEntity.java         |  3 +++
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6946a2d..e56bea5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,7 @@
         <module>view-object-api</module>
     </modules>
     <properties>
+        <business.entitymodel.version>0.1.5</business.entitymodel.version>
         <cef.designtime.version>0.2.26</cef.designtime.version>
         <das.commonmodel.designtime.version>0.1.18</das.commonmodel.designtime.version>
         <bef.designtime.version>0.2.17</bef.designtime.version>
@@ -60,25 +61,25 @@
         <lcm-fs-api.version>0.1.0</lcm-fs-api.version>
         <caf-cef-dt-spi.version>0.1.7</caf-cef-dt-spi.version>
         <caf-rpc-api.version>0.3.4</caf-rpc-api.version>
-        <bef-entity-model.version>0.1.2</bef-entity-model.version>
+        <bef-entity-model.version>0.1.5</bef-entity-model.version>
         <metadata-service-dev-spi.version>0.1.0</metadata-service-dev-spi.version>
     </properties>
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>com.inspur.edp</groupId>
-                <artifactId>cef-designtime-api</artifactId>
-                <version>${cef.designtime.version}</version>
+                <artifactId>common-entity-model</artifactId>
+                <version>${business.entitymodel.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.inspur.edp</groupId>
-                <artifactId>das-commonmodel</artifactId>
-                <version>${das.commonmodel.designtime.version}</version>
+                <artifactId>common-model</artifactId>
+                <version>${business.entitymodel.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.inspur.edp</groupId>
-                <artifactId>bef-bizentity</artifactId>
-                <version>${bef.designtime.version}</version>
+                <artifactId>business-entity-model</artifactId>
+                <version>${business.entitymodel.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.inspur.edp</groupId>
@@ -160,6 +161,11 @@
                 <artifactId>business-entity-model</artifactId>
                 <version>${bef-entity-model.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.inspur.edp</groupId>
+                <artifactId>unified-datatype-model</artifactId>
+                <version>${bef-entity-model.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.inspur.edp</groupId>
                 <artifactId>lcm-logging-service</artifactId>
diff --git a/view-object-manager/pom.xml b/view-object-manager/pom.xml
index d343b24..f379594 100644
--- a/view-object-manager/pom.xml
+++ b/view-object-manager/pom.xml
@@ -31,6 +31,10 @@
     <version>0.1.2</version>
 
     <dependencies>
+        <dependency>
+            <groupId>com.inspur.edp</groupId>
+            <artifactId>common-model</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.inspur.edp</groupId>
             <artifactId>metadata-service-dev-api</artifactId>
@@ -52,10 +56,6 @@
             <artifactId>runtime-customize-api</artifactId>
             <version>0.1.1-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.inspur.edp</groupId>
-            <artifactId>common-model</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.inspur.edp</groupId>
             <artifactId>lcm-metadata-api</artifactId>
diff --git a/view-object-model/pom.xml b/view-object-model/pom.xml
index 59f9188..27d319f 100644
--- a/view-object-model/pom.xml
+++ b/view-object-model/pom.xml
@@ -67,7 +67,7 @@
         </dependency>
         <dependency>
             <groupId>com.inspur.edp</groupId>
-            <artifactId>cef-designtime-api</artifactId>
+            <artifactId>business-entity-model</artifactId>
         </dependency>
         <dependency>
             <groupId>com.inspur.edp</groupId>
@@ -95,8 +95,7 @@
         </dependency>
         <dependency>
             <groupId>com.inspur.edp</groupId>
-            <artifactId>udt-designtime-api</artifactId>
-            <version>0.1.7</version>
+            <artifactId>unified-datatype-model</artifactId>
         </dependency>
         <dependency>
             <groupId>com.inspur.edp</groupId>
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 5071664..f22e47f 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;
-- 
Gitee


From 7322005433f2c9e66c17b6138299686b273be626 Mon Sep 17 00:00:00 2001
From: wangmaojian <wangmaojian@inspur.com>
Date: Thu, 8 Aug 2024 10:50:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                     | 29 ++++++++++++-----------------
 view-object-manager/pom.xml |  4 ++++
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index ebcee74..518b605 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <lcm-fs-api.version>0.1.0</lcm-fs-api.version>
         <caf-cef-dt-spi.version>0.1.7</caf-cef-dt-spi.version>
         <caf-rpc-api.version>0.3.4</caf-rpc-api.version>
-        <bef-entity-model.version>0.1.2</bef-entity-model.version>
+        <bef-entity-model.version>0.1.5</bef-entity-model.version>
         <metadata-service-dev.version>0.1.0</metadata-service-dev.version>
         <metadata-service-dev-api.version>0.1.1</metadata-service-dev-api.version>
         <metadata-service.version>0.1.0</metadata-service.version>
@@ -70,18 +70,23 @@
         <dependencies>
             <dependency>
                 <groupId>com.inspur.edp</groupId>
-                <artifactId>cef-designtime-api</artifactId>
-                <version>${cef.designtime.version}</version>
+                <artifactId>business-entity-model</artifactId>
+                <version>${bef-entity-model.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.inspur.edp</groupId>
-                <artifactId>das-commonmodel</artifactId>
-                <version>${das.commonmodel.designtime.version}</version>
+                <artifactId>unified-datatype-model</artifactId>
+                <version>${bef-entity-model.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.inspur.edp</groupId>
-                <artifactId>bef-bizentity</artifactId>
-                <version>${bef.designtime.version}</version>
+                <artifactId>common-entity-model</artifactId>
+                <version>${bef-entity-model.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.inspur.edp</groupId>
+                <artifactId>common-model</artifactId>
+                <version>${bef-entity-model.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.inspur.edp</groupId>
@@ -117,21 +122,11 @@
                 <artifactId>caf-caching</artifactId>
                 <version>${caf-caching.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.inspur.edp</groupId>
-                <artifactId>common-model</artifactId>
-                <version>${common-model.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.inspur.edp</groupId>
                 <artifactId>common-entity-variable-generator</artifactId>
                 <version>${common-variable-generator.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.inspur.edp</groupId>
-                <artifactId>business-entity-model</artifactId>
-                <version>${bef-entity-model.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.inspur.edp</groupId>
                 <artifactId>lcm-logging-service</artifactId>
diff --git a/view-object-manager/pom.xml b/view-object-manager/pom.xml
index 47967bc..ac30806 100644
--- a/view-object-manager/pom.xml
+++ b/view-object-manager/pom.xml
@@ -44,6 +44,10 @@
             <scope>compile</scope>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.inspur.edp</groupId>
+            <artifactId>common-model</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.inspur.edp</groupId>
             <artifactId>runtime-customize-api</artifactId>
-- 
Gitee