From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
WinFrmUI/Yw.WinFrmUI.Phart.Core/Properties/Resources.resx | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Phart.Core/Properties/Resources.resx b/WinFrmUI/Yw.WinFrmUI.Phart.Core/Properties/Resources.resx
index 967d922..9c6fffb 100644
--- a/WinFrmUI/Yw.WinFrmUI.Phart.Core/Properties/Resources.resx
+++ b/WinFrmUI/Yw.WinFrmUI.Phart.Core/Properties/Resources.resx
@@ -121,4 +121,31 @@
<data name="insertgroupfooter" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\insertgroupfooter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
+ <data name="business_calculator" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\business_calculator.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ </data>
+ <data name="inserttablerowsbelow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\inserttablerowsbelow.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ </data>
+ <data name="removefooter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\removefooter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ </data>
+ <data name="inserttablerowsbelow1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\inserttablerowsbelow1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ </data>
+ <data name="removefooter1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\removefooter1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ </data>
+ <data name="inserttablerowsbelow2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\inserttablerowsbelow2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ </data>
+ <data name="removefooter2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\removefooter2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ </data>
+ <data name="cut" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\cut.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ </data>
+ <data name="cut1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\cut1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ </data>
</root>
\ No newline at end of file
--
Gitblit v1.9.3