diff --git a/FrmAccessoryAnalysis.cs b/FrmAccessoryAnalysis.cs
index 190d82c..44df27f 100644
--- a/FrmAccessoryAnalysis.cs
+++ b/FrmAccessoryAnalysis.cs
@@ -111,6 +111,7 @@
         /// <param name="e"></param>
         private void btnEnter_Click(object sender, EventArgs e)
         {
+            if (resPolygon == null) return;
             dataGridViewX1.Rows.Clear();
             if (txtRadius.Text == "")
             {

diff --git a/FrmAccessoryAnalysis.cs b/FrmAccessoryAnalysis.cs
index 190d82c..44df27f 100644
--- a/FrmAccessoryAnalysis.cs
+++ b/FrmAccessoryAnalysis.cs
@@ -111,6 +111,7 @@
         /// <param name="e"></param>
         private void btnEnter_Click(object sender, EventArgs e)
         {
+            if (resPolygon == null) return;
             dataGridViewX1.Rows.Clear();
             if (txtRadius.Text == "")
             {
diff --git a/MarkInfo.cs b/MarkInfo.cs
index c762669..9a27ea9 100644
--- a/MarkInfo.cs
+++ b/MarkInfo.cs
@@ -198,7 +198,7 @@
             startPoint.X = selLine[0][0].X;
             startPoint.Y = selLine[0][0].Y;
             startPoint.Z = selLine[0][0].Z;
-            string desc0 = "起点标高：" + resFeature.GetFieldAsString("起始地面高程") + "米";
+            string desc0 = "起点标高：" + resFeature.GetFieldAsString("起始地面高") + "米";
             MarkInfo markInfo0 = new MarkInfo();
             markInfo0.Desc = desc0;
             markInfo0.Point = startPoint;
@@ -207,7 +207,7 @@
             endPoint.X = selLine[0][selLine[0].Count - 1].X;
             endPoint.Y = selLine[0][selLine[0].Count - 1].Y;
             endPoint.Z = selLine[0][selLine[0].Count - 1].Z;
-            string desc1 = "终点标高：" + resFeature.GetFieldAsString("终止地面高程") + "米";
+            string desc1 = "终点标高：" + resFeature.GetFieldAsString("终止地面高") + "米";
             MarkInfo markInfo1 = new MarkInfo();
             markInfo1.Desc = desc1;
             markInfo1.Point = endPoint;

diff --git a/FrmAccessoryAnalysis.cs b/FrmAccessoryAnalysis.cs
index 190d82c..44df27f 100644
--- a/FrmAccessoryAnalysis.cs
+++ b/FrmAccessoryAnalysis.cs
@@ -111,6 +111,7 @@
         /// <param name="e"></param>
         private void btnEnter_Click(object sender, EventArgs e)
         {
+            if (resPolygon == null) return;
             dataGridViewX1.Rows.Clear();
             if (txtRadius.Text == "")
             {
diff --git a/MarkInfo.cs b/MarkInfo.cs
index c762669..9a27ea9 100644
--- a/MarkInfo.cs
+++ b/MarkInfo.cs
@@ -198,7 +198,7 @@
             startPoint.X = selLine[0][0].X;
             startPoint.Y = selLine[0][0].Y;
             startPoint.Z = selLine[0][0].Z;
-            string desc0 = "起点标高：" + resFeature.GetFieldAsString("起始地面高程") + "米";
+            string desc0 = "起点标高：" + resFeature.GetFieldAsString("起始地面高") + "米";
             MarkInfo markInfo0 = new MarkInfo();
             markInfo0.Desc = desc0;
             markInfo0.Point = startPoint;
@@ -207,7 +207,7 @@
             endPoint.X = selLine[0][selLine[0].Count - 1].X;
             endPoint.Y = selLine[0][selLine[0].Count - 1].Y;
             endPoint.Z = selLine[0][selLine[0].Count - 1].Z;
-            string desc1 = "终点标高：" + resFeature.GetFieldAsString("终止地面高程") + "米";
+            string desc1 = "终点标高：" + resFeature.GetFieldAsString("终止地面高") + "米";
             MarkInfo markInfo1 = new MarkInfo();
             markInfo1.Desc = desc1;
             markInfo1.Point = endPoint;
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index e34ba41..cbcf9a7 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]

diff --git a/FrmAccessoryAnalysis.cs b/FrmAccessoryAnalysis.cs
index 190d82c..44df27f 100644
--- a/FrmAccessoryAnalysis.cs
+++ b/FrmAccessoryAnalysis.cs
@@ -111,6 +111,7 @@
         /// <param name="e"></param>
         private void btnEnter_Click(object sender, EventArgs e)
         {
+            if (resPolygon == null) return;
             dataGridViewX1.Rows.Clear();
             if (txtRadius.Text == "")
             {
diff --git a/MarkInfo.cs b/MarkInfo.cs
index c762669..9a27ea9 100644
--- a/MarkInfo.cs
+++ b/MarkInfo.cs
@@ -198,7 +198,7 @@
             startPoint.X = selLine[0][0].X;
             startPoint.Y = selLine[0][0].Y;
             startPoint.Z = selLine[0][0].Z;
-            string desc0 = "起点标高：" + resFeature.GetFieldAsString("起始地面高程") + "米";
+            string desc0 = "起点标高：" + resFeature.GetFieldAsString("起始地面高") + "米";
             MarkInfo markInfo0 = new MarkInfo();
             markInfo0.Desc = desc0;
             markInfo0.Point = startPoint;
@@ -207,7 +207,7 @@
             endPoint.X = selLine[0][selLine[0].Count - 1].X;
             endPoint.Y = selLine[0][selLine[0].Count - 1].Y;
             endPoint.Z = selLine[0][selLine[0].Count - 1].Z;
-            string desc1 = "终点标高：" + resFeature.GetFieldAsString("终止地面高程") + "米";
+            string desc1 = "终点标高：" + resFeature.GetFieldAsString("终止地面高") + "米";
             MarkInfo markInfo1 = new MarkInfo();
             markInfo1.Desc = desc1;
             markInfo1.Point = endPoint;
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index e34ba41..cbcf9a7 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]
diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml
index 89911da..c3755a3 100644
--- a/bin/x86/Debug/Config.xml
+++ b/bin/x86/Debug/Config.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Params>
   <FormText>LocaSpace三维地下管线信息系统</FormText>
-  <user>plxx</user>
+  <user>gz</user>
   <database>orcl</database>
-  <dbserver>127.0.0.1</dbserver>
-  <dbpassword>plxx</dbpassword>
+  <dbserver>47.96.29.200</dbserver>
+  <dbpassword>gz</dbpassword>
   <locaserverip>127.0.0.1</locaserverip>
   <locaserverport>1500</locaserverport>
   <rooturl>http://127.0.0.1/images/</rooturl>

diff --git a/FrmAccessoryAnalysis.cs b/FrmAccessoryAnalysis.cs
index 190d82c..44df27f 100644
--- a/FrmAccessoryAnalysis.cs
+++ b/FrmAccessoryAnalysis.cs
@@ -111,6 +111,7 @@
         /// <param name="e"></param>
         private void btnEnter_Click(object sender, EventArgs e)
         {
+            if (resPolygon == null) return;
             dataGridViewX1.Rows.Clear();
             if (txtRadius.Text == "")
             {
diff --git a/MarkInfo.cs b/MarkInfo.cs
index c762669..9a27ea9 100644
--- a/MarkInfo.cs
+++ b/MarkInfo.cs
@@ -198,7 +198,7 @@
             startPoint.X = selLine[0][0].X;
             startPoint.Y = selLine[0][0].Y;
             startPoint.Z = selLine[0][0].Z;
-            string desc0 = "起点标高：" + resFeature.GetFieldAsString("起始地面高程") + "米";
+            string desc0 = "起点标高：" + resFeature.GetFieldAsString("起始地面高") + "米";
             MarkInfo markInfo0 = new MarkInfo();
             markInfo0.Desc = desc0;
             markInfo0.Point = startPoint;
@@ -207,7 +207,7 @@
             endPoint.X = selLine[0][selLine[0].Count - 1].X;
             endPoint.Y = selLine[0][selLine[0].Count - 1].Y;
             endPoint.Z = selLine[0][selLine[0].Count - 1].Z;
-            string desc1 = "终点标高：" + resFeature.GetFieldAsString("终止地面高程") + "米";
+            string desc1 = "终点标高：" + resFeature.GetFieldAsString("终止地面高") + "米";
             MarkInfo markInfo1 = new MarkInfo();
             markInfo1.Desc = desc1;
             markInfo1.Point = endPoint;
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index e34ba41..cbcf9a7 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]
diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml
index 89911da..c3755a3 100644
--- a/bin/x86/Debug/Config.xml
+++ b/bin/x86/Debug/Config.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Params>
   <FormText>LocaSpace三维地下管线信息系统</FormText>
-  <user>plxx</user>
+  <user>gz</user>
   <database>orcl</database>
-  <dbserver>127.0.0.1</dbserver>
-  <dbpassword>plxx</dbpassword>
+  <dbserver>47.96.29.200</dbserver>
+  <dbpassword>gz</dbpassword>
   <locaserverip>127.0.0.1</locaserverip>
   <locaserverport>1500</locaserverport>
   <rooturl>http://127.0.0.1/images/</rooturl>
diff --git a/bin/x86/EMS1.2.0.0.rar b/bin/x86/EMS1.2.0.0.rar
new file mode 100644
index 0000000..559dca9
--- /dev/null
+++ b/bin/x86/EMS1.2.0.0.rar
Binary files differ