Merge branch 'yuetuan' into online

src/views/resetTeaming/modals/review-detail.vue

@@ -88,6 +88,10 @@
                width="600px"
                title="查看学员">
       <el-table :data="simpleUserDto">
+        <el-table-column prop="userId"
+                         label="用户ID"
+                         width="180">
+        </el-table-column>
         <el-table-column prop="userName"
                          label="姓名"
                          width="180">
@@ -96,10 +100,6 @@
                          label="声部"
                          width="180">
         </el-table-column>
-        <el-table-column prop="phone"
-                         label="手机号"
-                         width="180">
-        </el-table-column>
       </el-table>
       <span slot="footer"
             class="dialog-footer">