Merge branch 'master' of http://139.155.15.221:3000/zoulei/XzXdDw

XzXdDw.App/EditForms/SinglePosParamEditor.cs

@@ -201,7 +201,7 @@ namespace XzXdDw.App.EditForms
             }
             catch (Exception ex)
             {
-                XtraMessageBox.Show($"两星一地定位失败,失败信息:{ex.Message}");
+                XtraMessageBox.Show($"单星定位失败,失败信息:{ex.Message}");
             }
         }
     }

XzXdDw.App/XzXdDw.App.csproj

@@ -371,7 +371,6 @@
     <EmbeddedResource Include="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="UserControl\CtrlPosSingle.resx">
       <DependentUpon>CtrlPosSingle.cs</DependentUpon>
     </EmbeddedResource>