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

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -1435,6 +1435,8 @@ namespace XdCxRhDW.App.UserControl
                 {
                     p.TargetInfoID = tar.ID;
                     p.TargetInfo = tar;
+                    p.BaseTargetName = tar.TargetName;
+                    p.ColorKey = tar.TargeColor;
                 });
                 gridView2.RefreshData();
                 Serilog.Log.Warning($"共修改了{items.Count()}个定位点的目标信息");

XdCxRhDW.App/XdCxRhDW.App.csproj

@@ -535,7 +535,6 @@
     <EmbeddedResource Include="PopupControl\ShowCxCtrl.resx">
       <DependentUpon>ShowCxCtrl.cs</DependentUpon>
     </EmbeddedResource>
-    <None Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>