Merge branch 'release2.1' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into release2.1

Bin/x64/Debug/Config/ProData/ReportTemplateConfig.xml

@@ -1,17 +1,17 @@
 <XmlConfig>
   <M_SY>
     <str_tb_ZBT>Inclusion Analysis </str_tb_ZBT>
-    <str_tb_FBT>Report</str_tb_FBT>
-    <str_tb_YPBH>0</str_tb_YPBH>
+    <str_tb_FBT>XXX大学</str_tb_FBT>
+    <str_tb_YPBH>0001</str_tb_YPBH>
     <str_tb_CKBZ>GB/T30834-2014</str_tb_CKBZ>
     <b_ck_ypsm>True</b_ck_ypsm>
     <b_ck_jggk>True</b_ck_jggk>
   </M_SY>
   <M_YMYJ>
-    <str_tb_ymwb>hbbbbbbbb</str_tb_ymwb>
+    <str_tb_ymwb>夹杂物分析报告</str_tb_ymwb>
     <str_tb_KHH>Copi0000123012</str_tb_KHH>
     <b_ck_ym>True</b_ck_ym>
-    <str_tb_yjwb>aaaaaaaaaaa</str_tb_yjwb>
+    <str_tb_yjwb>夹杂物分析报告</str_tb_yjwb>
   </M_YMYJ>
   <M_KLFXJG>
     <b_ck_klcc_xsmk>True</b_ck_klcc_xsmk>

OTSIncAMeasureApp/0-OTSModel/Measure/GetParamData/COTSMsrPrjResultData.cs

@@ -419,7 +419,7 @@ namespace OTSModelSharp
                     allPartArea += typeArea;
                 }
                 rst.SetResultItems(rstItms);
-                rst.SetMeasuredArea(Convert.ToUInt32(msrFldsArea * 1000000));
+                rst.SetMeasuredArea(Convert.ToUInt64(msrFldsArea * 1000000));
                 rst.SetRatio(allPartArea / (msrFldsArea * 1000000));
                 return true;
             }