Merge branch 'master' of http://code.dashoo.cn/dashoo/biobank

src/dashoo.cn/frontend_animal/src/pages/samples/archived/index.vue

@@ -1148,7 +1148,7 @@ export default {
         }
       }
       let params = {
-        currentPage: this.currentPage,
+        current_page: this.currentPage,
         size: this.size,
         bar_code: this.BarCode,
         sample_code: this.SampleCode,
@@ -1195,7 +1195,7 @@ export default {
           }
         }
         let paramsid = {
-          Id: id
+          id: id
         }
         params = Object.assign(params, paramsid)
       }

src/dashoo.cn/frontend_animal/src/pages/samples/waitingstore/index.vue

@@ -1153,7 +1153,7 @@
           }
         }
         let params = {
-          currentPage: this.exportType == 'exportall' ? 0 : this.currentPage,
+          current_page: this.exportType == 'exportall' ? 0 : this.currentPage,
           size: this.exportType == 'exportall' ? 0 : this.size,
           bar_code: this.BarCode,
           sample_code: this.SampleCode,