Merge branch 'develop' into test

9c27c35a · 姜雷 · 31a87a30 · 928195cc · 9c27c35a · 9c27c35a
Commit 9c27c35a authored Jan 14, 2020 by 姜雷
Showing with 1 addition and 1 deletion

EquipmentOperationDetails.js ...ts/EquipmentOperationDetails/EquipmentOperationDetails.js +0 -0

EquipmentOperationDetails.ts ...ts/EquipmentOperationDetails/EquipmentOperationDetails.ts +1 -1

No files found.
--- a/miniprogram/pages/components/EquipmentOperationDetails/EquipmentOperationDetails.js
+++ b/miniprogram/pages/components/EquipmentOperationDetails/EquipmentOperationDetails.js
--- a/miniprogram/pages/components/EquipmentOperationDetails/EquipmentOperationDetails.ts
+++ b/miniprogram/pages/components/EquipmentOperationDetails/EquipmentOperationDetails.ts
@@ -43,7 +43,7 @@ Component({
      count: 0,
    },
    pageNum: 1,
-    pageSize: 10,
+    pageSize: 15,
    dataList: [],
    deviceType: 2, // （2：洗衣，3：饮水，4：吹风，5：洗浴）
  },