Merge branch 'Release2.5' of http://36.129.163.148:30080/gogsadmin/OTS into Release2.5

OTSIncAReportApp/2-CommonFunction/CommonClass/DisplayParticle.cs

@@ -810,6 +810,8 @@ namespace OTSIncAReportGraph
             rect.Width = i_width - rect.X ;
             rect.Height = i_height - rect.Y ;
 
+            if (rect.Width < 1) rect.Width = 1;
+            if (rect.Height < 1) rect.Height = 1;
         
 
             return rect;

OTSIncAReportApp/ReportTemplate/OTS_DEVReport.cs

@@ -1357,6 +1357,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             }
             else
             {
+                xrLabel_pageinfo.Font= new Font(Schriftart_chinese, dev_classify.Font.Size);
                 this.xrLabel_pageinfo.Visible = true;
                 this.xrLabel_pageinfo.Text = string.Format("第{0}页，共{1}页", pageindex , pagecount - 1);
             }