Merge remote-tracking branch 'origin/master'

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>

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>

src/main/resources/application.properties

@@ -347,6 +347,8 @@ logging.level.com.hypaas=INFO
 
 
 
+
+