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/EditPumpProductMainDlg.cs |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpProductMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpProductMainDlg.cs
index 110f257..3c1450c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpProductMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpProductMainDlg.cs
@@ -1,5 +1,4 @@
-锘縰sing HStation.Dto;
-using Mapster;
+锘縰sing Mapster;
 
 namespace HStation.WinFrmUI.Xhs.PumpProduct
 {

--
Gitblit v1.9.3