Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/router/index.js

src/views/equipment-management/equipment-management/equipment-management.vue

@@ -152,6 +152,7 @@
           <span>{{ scope.row.reservationMethod == 1 ? "按时段预约"  :"-" }}</span>
         </template>
       </el-table-column>
+
       <el-table-column v-if="userType=== '3'" label="服务价格" align="center" prop="orderPrice" >
         <template slot-scope="scope">
           <span>{{(scope.row.orderPrice == "" ||scope.row.orderPrice==null)? "-" :scope.row.orderPrice +"元"}}</span>