Merge branch 'master' of http://223.75.76.159:9090/zq/picc-admin-portal

src/views/base/promoter-list.vue

@@ -62,10 +62,10 @@
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column prop="jpCloudUser.realName" label="推广员" width="180"></el-table-column>
-      <el-table-column prop="jpCloudUser.phone" label="手机号" width="180"></el-table-column>
       <el-table-column prop="promoter" label="云平台账号" width="180"></el-table-column>
-      <el-table-column prop="name" label="推广企业名称" width="180"></el-table-column>
+      <el-table-column prop="jpCloudUser.realName" label="推广员姓名" width="180"></el-table-column>
+      <el-table-column prop="jpCloudUser.phone" label="手机号" width="180"></el-table-column>
+      <el-table-column prop="name" label="推广企业名称"></el-table-column>
     </el-table>
     <el-pagination
       :current-page.sync="pageIndex"

src/views/sys/dataDictionary-detail.vue

@@ -7,6 +7,7 @@
   <el-dialog
     :visible.sync="showDialog"
     :title="modalTitle"
+    :close-on-click-modal="false"
     :modal-append-to-body="false"
     style="text-align:left;"
     @close="closeDialog"

src/views/sys/menu-detail.vue

@@ -8,6 +8,7 @@
     :visible.sync="showDialog"
     :title="modalTitle"
     :modal-append-to-body="false"
+    :close-on-click-modal="false"
     style="text-align:left;"
     @close="closeDialog"
   >