Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

OTSIncAReportApp/1-UI/OTSReportExport/DataIntegration/BasicData.cs

@@ -172,9 +172,15 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
                 if (!bl)
                 {
                     DataTable dta = m_bt_DBData.Clone();
-                    if (m_bt_DBData.Rows.Count != 0)
-                    {
-                        dta.Rows.Add(m_bt_DBData.Rows[0].ItemArray);
+                    //DataTable dtb = m_bt_DBData.Clone();
+                    // 添加一个空行
+                    DataRow newRow = dta.NewRow();
+                    dta.Rows.Add(newRow);
+
+
+                    //if (m_bt_DBData.Rows.Count != 0)
+                    //{
+                        //dta.Rows.Add(dtb.Rows[0].ItemArray);
                         for (int b = 0; b < dta.Columns.Count; b++)
                         {
                             if (dta.Columns[b].ColumnName == "TypeName")
@@ -192,7 +198,7 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
                         }
 
                         datass.Rows.Add(dta.Rows[0].ItemArray);
-                    }
+                    //}
 
 
                 }