Merge branch 'qin_v4'

src/components/DesignForm/public/form/formItem.vue

@@ -1075,7 +1075,7 @@ const pickUserVal = (val:any) => {
 				<!--拥有者-->
 				<OwnerPage v-else-if="data.type === 'owner' " :data="data" :tablekey="props.tablekey" :numrun="props.numrun"  />
 				<!--所属部门-->
-				<DeptOrgPage v-else-if="data.type === 'deptOrg' " :data="data"  :form-props="formProps" :tablekey="props.tablekey" />
+				
 				
 				<AssociatedForms  v-else-if="data.type === 'associatedForms' && type != 4" :data="data" :form-props="formProps" :tablekey="props.tablekey" />
 				<LowcodeImage  v-else-if="data.type === 'lowcodeImage' " :data="data" :tablekey="props.tablekey" :form-table-set-up="props.alldata" >