Merge branch 'develop' into test

ab672039 · 姜雷 · ca61fe75 · 980cb397 · ab672039
Commit ab672039 authored Jan 14, 2020 by 姜雷
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

equipmentReport.json miniprogram/pages/equipmentReport/equipmentReport.json +1 -0

No files found.
--- a/miniprogram/pages/equipmentReport/equipmentReport.json
+++ b/miniprogram/pages/equipmentReport/equipmentReport.json
 {
+  "navigationBarTitleText": "运营数据",
  "usingComponents": {
    "equipment-operation-details": "../components/EquipmentOperationDetails/EquipmentOperationDetails",
    "equipment-state": "../components/EquipmentState/EquipmentState",