Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -145,6 +145,21 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             List<string> vs = new List<string>() { "DMAX", "DMIN", "Area", "FERET" };
             string po = vs[m_otsreport_export.m_mbszclass.M_KLFXJG.index_cb_klcc_jsfs];
 
+            switch (po)
+            {
+                case "DMAX":
+                    po = "DMAX";
+                    break;
+                case "DMIN":
+                    po = "DMIN";
+                    break;
+                case "CIRCLE":
+                    po = "Area";
+                    break;
+                case "FERET":
+                    po = "DFERET";
+                    break;
+            }
             for (int i=0;i< dt.Rows.Count;i++)
             {
                 DataRow dr = m_bt_DBData.NewRow();