From f2333318a31e92f6cbc3a572d8eb9fae9da0f892 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 13:59:15 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.designer.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/09-Manufacturer/ManufacturerMainPanel.designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.designer.cs
similarity index 98%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/09-Manufacturer/ManufacturerMainPanel.designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.designer.cs
index 1bf7bc8..709ea87 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/09-Manufacturer/ManufacturerMainPanel.designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/09-manufacturer/ManufacturerMainPage.designer.cs
@@ -3,7 +3,7 @@
namespace HStation.WinFrmUI
{
- partial class ManufacturerMainPanel
+ partial class AssetsManufacturerMainPage
{
/// <summary>
/// Required designer variable.
@@ -32,7 +32,7 @@
private void InitializeComponent()
{
components = new Container();
- ComponentResourceManager resources = new ComponentResourceManager(typeof(ManufacturerMainPanel));
+ ComponentResourceManager resources = new ComponentResourceManager(typeof(AssetsManufacturerMainPage));
ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
barBtnAdd = new DevExpress.XtraBars.BarButtonItem();
barBtnEdit = new DevExpress.XtraBars.BarButtonItem();
@@ -255,7 +255,7 @@
colDescription.Visible = true;
colDescription.VisibleIndex = 7;
//
- // ManufacturerMainPanel
+ // AssetsManufacturerMainPage
//
Appearance.BackColor = SystemColors.Control;
Appearance.Options.UseBackColor = true;
@@ -263,7 +263,7 @@
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(gridControl1);
Controls.Add(ribbonControl1);
- Name = "ManufacturerMainPanel";
+ Name = "AssetsManufacturerMainPanel";
Size = new Size(818, 681);
((ISupportInitialize)ribbonControl1).EndInit();
((ISupportInitialize)gridControl1).EndInit();
--
Gitblit v1.9.3