diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
index d8f22bf06422384a2e6f1bc56787d5736044b94a..4f5ca2ad9c927e47b586c4c3d6a34c962560ab1f 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
@@ -48,7 +48,7 @@ public class ${entityName} implements Serializable {
     </#if>
 	/**${po.filedComment}*/
 	<#if po.fieldName == primaryKeyField>
-	@TableId(type = IdType.ID_WORKER_STR)
+	@TableId(type = IdType.ASSIGN_ID)
 	<#else>
   		<#if po.fieldDbType =='Date'>
 			<#if po.classType=='date'>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
index 3863690d4d98ba4fae661e6df80bb2b131f53ece..8ca5a262fd4a04c09e90bd8a191461a16dd98ff3 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
@@ -143,7 +143,7 @@
       </a-form>
     </div>
     <!-- 查询区域-END -->
-    
+
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
@@ -234,7 +234,7 @@
       </a-table>
     </div>
 
-    <${tableName?replace("_","-")}-modal ref="modalForm" @ok="modalFormOk"></${tableName?replace("_","-")}-modal>
+    <${Format.humpToShortbar(entityName)}-modal ref="modalForm" @ok="modalFormOk"></${Format.humpToShortbar(entityName)}-modal>
   </a-card>
 </template>
 
@@ -247,7 +247,6 @@
   <#if bpm_flag>
   import { postAction } from '@/api/manage'
   </#if>
-
   <#if query_field_select>
   import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
   </#if>
@@ -289,7 +288,7 @@
   </#if>
 
   export default {
-    name: "${entityName}List",
+    name: '${entityName}List',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
       <#if query_field_select>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
index 83f903a4b95b882795c91bb6776397928e29359d..5e5a269bec19504514fee5bf4173543a93eaa959 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
@@ -168,7 +168,7 @@
   </#if>
 
   export default {
-    name: "${entityName}Form",
+    name: '${entityName}Form',
     components: {
       JFormContainer,
     <#if form_date>
@@ -218,8 +218,8 @@
         default: ()=>{},
         required: false
       },
-      //表单模式：false流程表单 true普通表单
-      normal: {
+      //表单模式：true流程表单 false普通表单
+      formBpm: {
         type: Boolean,
         default: false,
         required: false
@@ -254,25 +254,21 @@
     },
     computed: {
       formDisabled(){
-        if(this.normal===false){
+        if(this.formBpm===true){
           if(this.formData.disabled===false){
             return false
-          }else{
-            return true
           }
+          return true
         }
         return this.disabled
       },
       showFlowSubmitButton(){
-        if(this.normal===false){
+        if(this.formBpm===true){
           if(this.formData.disabled===false){
             return true
-          }else{
-            return false
           }
-        }else{
-          return false
         }
+        return false
       }
     },
     created () {
@@ -293,7 +289,7 @@
       },
       //渲染流程表单数据
       showFlowData(){
-        if(this.normal === false){
+        if(this.formBpm === true){
           let params = {id:this.formData.dataId};
           getAction(this.url.queryById,params).then((res)=>{
             if(res.success){
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
index 794308f35921005393df63e5b1fabe611e2cb45e..9a707e0396faf640fa50a590804f4b6aacd0b342 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
@@ -15,10 +15,10 @@
     :visible="visible"
     switchFullscreen
     @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disablesubmit} }"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <${tableName?replace("_","-")}-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></${tableName?replace("_","-")}-form>
+    <${Format.humpToShortbar(entityName)}-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></${Format.humpToShortbar(entityName)}-form>
   </j-modal>
 </template>
 
@@ -26,7 +26,7 @@
 
   import ${entityName}Form from './${entityName}Form'
   export default {
-    name: "${entityName}Modal",
+    name: '${entityName}Modal',
     components: {
       ${entityName}Form
     },
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei
index dbfbce7f6c99d47ad6bdd6acf942cfdb5dbda775..c0a75f15d54c3df4acc02595fbc773f590db9a6c 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei
@@ -15,7 +15,7 @@
     :closable="false"
     @close="close"
     :visible="visible">
-    <${tableName?replace("_","-")}-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></${tableName?replace("_","-")}-form>
+    <${Format.humpToShortbar(entityName)}-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></${Format.humpToShortbar(entityName)}-form>
     <div class="drawer-footer">
       <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
       <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
@@ -28,7 +28,7 @@
   import ${entityName}Form from './${entityName}Form'
 
   export default {
-    name: "${entityName}Modal",
+    name: '${entityName}Modal',
     components: {
       ${entityName}Form
     },
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
index db93896464161d2fa0b478e9a6e8890a2d8acdb4..31f478ca7a8f6c3738e61e79092030ce5b4df7b7 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
@@ -42,7 +42,7 @@ public class ${entityName} implements Serializable {
     </#if>
 	/**${po.filedComment}*/
 	<#if po.fieldName == primaryKeyField>
-	@TableId(type = IdType.ID_WORKER_STR)
+	@TableId(type = IdType.ASSIGN_ID)
 	<#else>
 		<#if po.fieldDbType =='Date'>
 			<#if po.classType=='date'>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
index 8e59725fbfebe7ec93ffdb415729f166b6983013..1e559ab56afbf4194a04f1b2c91956fbf707c4c0 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
@@ -43,7 +43,7 @@ public class ${subTab.entityName} implements Serializable {
 	</#if>
 	/**${po.filedComment}*/
 	<#if po.fieldName == primaryKeyField>
-	@TableId(type = IdType.ID_WORKER_STR)
+	@TableId(type = IdType.ASSIGN_ID)
 	<#else>
 		<#if po.fieldDbType =='Date'>
 			<#if po.classType=='date'>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
index d87358223cbebe70e1e75bca9ad8e18507b941d0..1a9cfe3123b342cab250c9896100c1cb79b016fa 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
@@ -224,7 +224,7 @@
       </a-table>
     </div>
 
-    <${tableName?replace("_","-")}-modal ref="modalForm" @ok="modalFormOk"/>
+    <${Format.humpToShortbar(entityName)}-modal ref="modalForm" @ok="modalFormOk"/>
   </a-card>
 </template>
 
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
index 842053940f3fb4ae45bfa2f5a5afd043ae0f64f4..2f51ce51b9b59df161d526c0d738e19cd9445c80 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei
@@ -416,7 +416,7 @@
         required: false
       },
       //表单模式：false流程表单 true普通表单
-      normal: {
+      formBpm: {
         type: Boolean,
         default: false,
         required: false
@@ -430,25 +430,21 @@
     },
     computed: {
       formDisabled(){
-        if(this.normal===false){
+        if(this.formBpm===true){
           if(this.formData.disabled===false){
             return false
-          }else{
-            return true
           }
+          return true
         }
         return this.disabled
       },
       showFlowSubmitButton(){
-        if(this.normal===false){
+        if(this.formBpm===true){
           if(this.formData.disabled===false){
             return true
-          }else{
-            return false
           }
-        }else{
-          return false
         }
+        return false
       }
     },
     created () {
@@ -456,6 +452,16 @@
       this.showFlowData();
     },
     methods: {
+      addBefore(){
+        this.form.resetFields()
+<#list subTables as sub><#rt/>
+  <#if sub.foreignRelationType =='1'>
+        this.$refs.${sub.entityName?uncap_first}Form.clearFormData()
+  <#else>
+        this.${sub.entityName?uncap_first}Table.dataSource=[]
+  </#if>
+</#list>
+      },
       getAllTable() {
         <#if hasOne2Many==true>
         let values = this.tableKeys.map(key => getRefPromise(this, key))
@@ -505,7 +511,7 @@
       },
       //渲染流程表单数据
       showFlowData(){
-        if(this.normal === false){
+        if(this.formBpm === true){
           let params = {id:this.formData.dataId};
           getAction(this.url.queryById,params).then((res)=>{
             if(res.success){
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
index ac03246c04fdd4fb19e45978ae5b90d5283ab8d2..8021bb8368ff88e2945e1718b607388fd70972a4 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
@@ -9,7 +9,7 @@
     @ok="handleOk"
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel">
-    <${tableName?replace("_","-")}-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal/>
+    <${Format.humpToShortbar(entityName)}-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>
   </j-modal>
 </template>
 
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
index 2ab8d4521aa7fc5426c1e35b300568cd7ff826b1..0d33483f9171e107e5fbb804387ef6189a5e0f0e 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
@@ -43,7 +43,7 @@ public class ${entityName} implements Serializable {
 	</#if>
 	/**${po.filedComment}*/
 	<#if po.fieldName == primaryKeyField>
-	@TableId(type = IdType.ID_WORKER_STR)
+	@TableId(type = IdType.ASSIGN_ID)
 	<#else>
   		<#if po.fieldDbType =='Date'>
 			<#if po.classType=='date'>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
index 32ae1a681fe49c21d70412f1c939d711773fa09f..a3029b03a49d1b40ccd16a65225776cb88efe0a5 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
@@ -42,7 +42,7 @@ public class ${entityName} implements Serializable {
     </#if>
 	/**${po.filedComment}*/
 	<#if po.fieldName == primaryKeyField>
-	@TableId(type = IdType.ID_WORKER_STR)
+	@TableId(type = IdType.ASSIGN_ID)
 	<#else>
 		<#if po.fieldDbType =='Date'>
 			<#if po.classType=='date'>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
index e3ee689349c7e92834ee5b96cfb4feb85b0b50d4..7c1161fbeb822b4ebafc4c34d05505ac5e19e713 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
@@ -31,7 +31,7 @@ public class ${subTab.entityName} implements Serializable {
 <#list subTab.originalColumns as po>
 	/**${po.filedComment}*/
 <#if po.fieldName == primaryKeyField>
-	@TableId(type = IdType.ID_WORKER_STR)
+	@TableId(type = IdType.ASSIGN_ID)
 <#else>
 	<#if po.fieldDbType =='Date'>
 		<#if po.classType=='date'>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
index 383f7f335a478221e55ea9f4a81124b9aedcbccd..cb5ece739b11d62c6a971ccb25bcdc1b12211c9b 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
@@ -42,7 +42,7 @@ public class ${entityName} implements Serializable {
     </#if>
 	/**${po.filedComment}*/
 	<#if po.fieldName == primaryKeyField>
-	@TableId(type = IdType.ID_WORKER_STR)
+	@TableId(type = IdType.ASSIGN_ID)
 	<#else>
 		<#if po.fieldDbType =='Date'>
 			<#if po.classType=='date'>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
index 66156f72c70a424734587b6474abbb89825c20d1..c58a2a20725021f6aff6c5d682f3b34a49124c69 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
@@ -44,7 +44,7 @@ public class ${subTab.entityName} implements Serializable {
 	</#if>
 	/**${po.filedComment}*/
 	<#if po.fieldName == primaryKeyField>
-	@TableId(type = IdType.ID_WORKER_STR)
+	@TableId(type = IdType.ASSIGN_ID)
 	<#else>
 		<#if po.fieldDbType =='Date'>
 			<#if po.classType=='date'>