Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationTerminal

InfoDetail.xaml

@@ -38,7 +38,7 @@
         <Grid Grid.Row="1" Grid.Column="0" HeightRequest="50">
             <HorizontalStackLayout BackgroundColor="#F0F0F0">
                 <Button Text="实时信息" Clicked="Button_real"  BackgroundColor="Transparent" TextColor="Black"/>
-                <Button Text="设备信息" Clicked="Button_machine"  BackgroundColor="Transparent" TextColor="Black"/>
+                <Button Text="物料信息" Clicked="Button_machine"  BackgroundColor="Transparent" TextColor="Black"/>
                 <Button Text="执行历史" Clicked="Button_history"  BackgroundColor="Transparent" TextColor="Black"/>
                 <Button Text="远程控制" Clicked="Button_control"  BackgroundColor="Transparent" TextColor="Black"/>
             </HorizontalStackLayout>