wyq 1 éve
szülő
commit
7edf326279

+ 0 - 1
Service/CheckServer/CheckServer.csproj

@@ -166,7 +166,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="packages.config" />
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

+ 0 - 1
Service/GpuCgServer/GpuCgServer.csproj

@@ -161,7 +161,6 @@
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
     <None Include="packages.config" />
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

+ 1 - 1
XdCxRhDW.App/ExtensionsDev/DateEditExtension.cs

@@ -14,7 +14,7 @@ namespace ExtensionsDev
     {
         public static DateEdit UseDefault(this DateEdit ctrl, string nullPrompt = "", string format = "yyyy-MM-dd HH:mm:ss")
         {
-            if (string.IsNullOrWhiteSpace(nullPrompt))
+            if (string.IsNullOrWhiteSpace(nullPrompt)&& SysConfig.Config!=null)
             {
                 ctrl.Properties.NullValuePrompt = SysConfig.Config.TimeZoneUTC;
                 ctrl.ToolTip= SysConfig.Config.TimeZoneUTC;

+ 1 - 4
XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -1305,12 +1305,9 @@ namespace XdCxRhDW.App.UserControl
 
             var dto = new PosRequestByTimeRangeDto()
             {
-                TarFrequpHz = (long?)txtFrequpMHz.EditValue,
                 BeginTime = frm.start,
                 EndTime = frm.end,
-                TaskInfoID = tsk.ID,
-                IncludeInvalidate = btnIncludeInvalidate.Checked
-
+                TaskInfoID = tsk.ID
             };
             string baseUrl = null;
             if (SysConfig.Config != null)