diff --git a/src/views/modules/heart/volunteerunion-add-or-update.vue b/src/views/modules/heart/volunteerunion-add-or-update.vue
index c1cc2be..1d952f6 100644
--- a/src/views/modules/heart/volunteerunion-add-or-update.vue
+++ b/src/views/modules/heart/volunteerunion-add-or-update.vue
@@ -2,35 +2,20 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
           <el-form-item label="联盟名称" prop="unionName">
-          <el-input v-model="dataForm.unionName" placeholder="联盟名称"></el-input>
+          <el-input v-model="dataForm.unionName" placeholder="联盟名称" style="width: 260px"></el-input>
       </el-form-item>
           <el-form-item label="联系人" prop="contacts">
-          <el-input v-model="dataForm.contacts" placeholder="联系人"></el-input>
+          <el-input v-model="dataForm.contacts" placeholder="联系人" style="width: 260px"></el-input>
       </el-form-item>
           <el-form-item label="联系电话" prop="phone">
-          <el-input v-model="dataForm.phone" placeholder="联系电话"></el-input>
-      </el-form-item>
-          <el-form-item label="团队介绍" prop="content">
-          <el-input v-model="dataForm.content" placeholder="团队介绍"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标识" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标识"></el-input>
+          <el-input v-model="dataForm.phone" placeholder="联系电话" style="width: 260px"></el-input>
       </el-form-item>
+        <el-form-item prop="content"
+                      label="团队介绍">
+            <el-row style="height: 550px;">
+                <tinymce-editor v-model="dataForm.content"></tinymce-editor>
+            </el-row>
+        </el-form-item>
       </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -41,6 +26,7 @@
 
 <script>
 import debounce from 'lodash/debounce'
+import TinymceEditor from '@/components/tinymce-editor'
 export default {
   data () {
     return {
@@ -75,27 +61,12 @@ export default {
         content: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        revision: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        delFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
       }
     }
   },
+    components: {
+        TinymceEditor
+    },
   methods: {
     init () {
       this.visible = true
diff --git a/src/views/modules/heart/volunteerunion.vue b/src/views/modules/heart/volunteerunion.vue
index 14ae947..759473e 100644
--- a/src/views/modules/heart/volunteerunion.vue
+++ b/src/views/modules/heart/volunteerunion.vue
@@ -2,36 +2,51 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-heart__volunteerunion}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        <el-form-item label="联盟名称" prop="unionName">
+          <el-input v-model="dataForm.unionName"
+                    placeholder="联盟名称"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="联系人" prop="contacts">
+          <el-input v-model="dataForm.contacts"
+                    placeholder="联系人"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话" prop="phone">
+          <el-input v-model="dataForm.phone"
+                    placeholder="联系电话"
+                    clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('heart:volunteerunion:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('heart:volunteerunion:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
+        <el-table-column type="index"
+                         width="50"
+                         label="序号" align="center"></el-table-column>
+<!--        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
+<!--        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>-->
         <el-table-column prop="unionName" label="联盟名称" header-align="center" align="center"></el-table-column>
         <el-table-column prop="contacts" label="联系人" header-align="center" align="center"></el-table-column>
         <el-table-column prop="phone" label="联系电话" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="content" label="团队介绍" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+<!--        <el-table-column prop="content" label="团队介绍" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>-->
         <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="删除标识" header-align="center" align="center"></el-table-column>
+<!--        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="delFlag" label="删除标识" header-align="center" align="center"></el-table-column>-->
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('heart:volunteerunion:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('heart:volunteerunion:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>