Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius into master

src/pages/activity/configurationstudentsList.vue

@@ -9,7 +9,6 @@
           <q-space />
           <div class="page-option">
             <q-btn color="accent" size="sm" icon="add" label="新增"  @click="addObj(null)"/> 
-            <!-- @click="addObj(null)" -->
           </div>
         </template>
 <template v-slot:body-cell-IsRequired="props">
@@ -119,7 +118,7 @@
                     this.loading = false;
                     if (res.Code == 1) {
                         this.dataList = res.Data.PageData;
-                        this.pageCount = res.Data.Count
+                        this.pageCount = res.Data.PageCount;
                     }
                     console.log("res", res);
                 });