Merge remote-tracking branch 'origin/development' into development

src/components/yunji/index.vue

@@ -52,7 +52,7 @@
       <el-form-item>
         <el-button type="primary" @click="getList">搜索</el-button>
         <el-button type="primary" plain @click="exportTable(list)">导出</el-button>
-        <el-button type="success" plain @click="classListOption()">班级统计</el-button>
+        <el-button type="success" plain @click="classListOption()">同步进度</el-button>
       </el-form-item>
     </el-form>
     <el-table :data="list" style="width: 100%">
@@ -98,12 +98,12 @@
 
     <el-dialog :title="classObj.title" :visible.sync="classObj.show" center width="800px">
       <div style="margin:10px;color: #888888">
-        同步时间：{{last_pull_time}}
+        最新同步时间：{{last_pull_time}}
       </div>
     <el-table :data="classList" >
       <el-table-column prop="teacher_name" label="班级老师">
       </el-table-column>
-       <el-table-column prop="num" label="班级人数">
+       <el-table-column prop="num" label="预计入班人数">
       </el-table-column>
     </el-table>
 
@@ -156,7 +156,7 @@ export default {
       goodList: [],
       classObj:{
         show: false,
-        title: "班级统计",
+        title: "同步进度",
         order_id: 0,
         teacher_id: 0
       },