From ef44e9cf93bdf4818c7b67d8c1e7b6a170a527cf Mon Sep 17 00:00:00 2001
From: hypaas <181620720@qq.com>
Date: Wed, 13 Dec 2023 15:11:39 +0800
Subject: [PATCH 1/2] Configure Continuous Integration ....

---
 modules/export/src/main/resources/domains/ExportDemo.xml    | 4 +++-
 modules/export/src/main/resources/views/ExportDemo-form.xml | 4 +++-
 src/main/resources/application.properties                   | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/export/src/main/resources/domains/ExportDemo.xml b/modules/export/src/main/resources/domains/ExportDemo.xml
index 8c7c7a1..df14261 100644
--- a/modules/export/src/main/resources/domains/ExportDemo.xml
+++ b/modules/export/src/main/resources/domains/ExportDemo.xml
@@ -4,7 +4,9 @@
   <entity hashAll="false" logUpdates="true" persistable="true" name="ExportDemo" cacheable="false" lang="java" strategy="SINGLE">
     <string actOverwrite="false" title="编码" copy="true" massUpdate="false" name="code" isJudg="false"/>
     <string actOverwrite="false" title="名称" copy="true" massUpdate="false" name="name" isJudg="false"/>
-    <many-to-one title="用户名称" massUpdate="false" ref="com.hypaas.auth.db.User" name="relationUserName" copy="true"/>
+    <many-to-one title="用户多对一" massUpdate="false" ref="com.hypaas.auth.db.User" name="relationUserName" copy="true"/>
     <one-to-one title="用户一对一" massUpdate="false" ref="com.hypaas.auth.db.User" name="userName" copy="true"/>
+    <one-to-many title="用户一对多" ref="com.hypaas.auth.db.User" name="oneToMany" copy="true"/>
+    <many-to-many title="用户多对多" ref="com.hypaas.auth.db.User" name="manyToMany" copy="true"/>
   </entity>
 </domain-models>
diff --git a/modules/export/src/main/resources/views/ExportDemo-form.xml b/modules/export/src/main/resources/views/ExportDemo-form.xml
index e3c86d0..436a4ab 100644
--- a/modules/export/src/main/resources/views/ExportDemo-form.xml
+++ b/modules/export/src/main/resources/views/ExportDemo-form.xml
@@ -4,8 +4,10 @@
     <panel itemSpan="6" showFrame="true" name="panel_11">
       <field name="code" title="编码"/>
       <field name="name" title="名称"/>
-      <field canSuggest="true" name="relationUserName" title="用户名称"/>
       <field canSuggest="true" name="userName" title="用户一对一"/>
+      <field name="oneToMany" title="用户一对多"/>
+      <field canSuggest="true" name="manyToMany" title="用户多对多"/>
+      <field canSuggest="true" name="relationUserName" title="用户多对一"/>
     </panel>
   </form>
 </object-views>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 6a86175..d6ab76a 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -342,5 +342,6 @@ logging.level.com.hypaas=INFO
 
 
 
+
 
 

From 442ccb617f94fdb3d204d2dd33d0408fcf18aeca Mon Sep 17 00:00:00 2001
From: hypaas <181620720@qq.com>
Date: Wed, 13 Dec 2023 15:11:42 +0800
Subject: [PATCH 2/2] Configure Continuous Integration ....

---
 src/main/resources/application.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index d6ab76a..13ba3e7 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -343,5 +343,6 @@ logging.level.com.hypaas=INFO
 
 
 
+