From 3fec42c6383aa3b8d65f744a93b8a918d7cc6e02 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 23 七月 2024 10:15:54 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/00-ViewModel/PumpMainViewModel.cs | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/00-ViewModel/PumpMainViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/00-ViewModel/PumpMainViewModel.cs
index c00afaa..7be9417 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/00-ViewModel/PumpMainViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/00-ViewModel/PumpMainViewModel.cs
@@ -1,7 +1,4 @@
-锘縰sing DevExpress.XtraSpreadsheet.Model.History;
-using HStation.Dto;
-
-namespace HStation.WinFrmUI.Xhs.PumpProduct
+锘縩amespace HStation.WinFrmUI.Xhs.PumpProduct
{
public class PumpMainViewModel : PumpMainDto
{
--
Gitblit v1.9.3