From 907a1579fecf2c160852cf99b3ea77c08eb481cc Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 17 十二月 2024 09:44:04 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysPropManage/SysPropManageMainPanel.resx |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysPropManage/SysPropManageMainPanel.resx b/WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysPropManage/SysPropManageMainPanel.resx
index 66e1ada..9525cad 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysPropManage/SysPropManageMainPanel.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysPropManage/SysPropManageMainPanel.resx
@@ -216,6 +216,9 @@
   <metadata name="propViewModelBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>161, 17</value>
   </metadata>
+  <metadata name="behaviorManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>532, 21</value>
+  </metadata>
   <data name="editorButtonImageOptions1.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
@@ -242,8 +245,5 @@
   </data>
   <metadata name="svgImage32.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>406, 21</value>
-  </metadata>
-  <metadata name="behaviorManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>532, 21</value>
   </metadata>
 </root>
\ No newline at end of file

--
Gitblit v1.9.3