From 1397937c99bca7f1227afae41a9effa7cac713ea Mon Sep 17 00:00:00 2001
From: lxw <xuewenliu11@163.com>
Date: Wed, 5 Jun 2024 17:20:39 +0800
Subject: [PATCH] =?UTF-8?q?swaporder=20=E6=B7=BB=E5=8A=A0swapway?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Entity/DbModel/Station/SwapOrder.cs | 6 +++---
 Service/Execute/Mgr/CommonMgr.cs    | 1 +
 WebStarter/WebStarter.csproj        | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Entity/DbModel/Station/SwapOrder.cs b/Entity/DbModel/Station/SwapOrder.cs
index 57aea8d..303b422 100644
--- a/Entity/DbModel/Station/SwapOrder.cs
+++ b/Entity/DbModel/Station/SwapOrder.cs
@@ -148,11 +148,11 @@ namespace Entity.DbModel.Station
         [SugarColumn(ColumnName = "cloud_sn")]
         public string? CloudSn { get; set; }
         /// <summary>
-        /// Desc:换电类型:;0手动换电;1自动换电
+        /// Desc:换电类型:;1自动换电;2手动换电
         /// Default:0
         /// Nullable:True
         /// </summary>
-        [SugarColumn(ColumnName = "swap_type")]
-        public int? SwapModel { get; set; }
+        [SugarColumn(ColumnName = "swap_way")]
+        public int? SwapWay { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Service/Execute/Mgr/CommonMgr.cs b/Service/Execute/Mgr/CommonMgr.cs
index 7143866..139d8e5 100644
--- a/Service/Execute/Mgr/CommonMgr.cs
+++ b/Service/Execute/Mgr/CommonMgr.cs
@@ -47,6 +47,7 @@ public class CommonMgr
     /// <returns></returns>
     public SwapOrder SaveOrder(SwapOrder swapOrder)
     {
+        swapOrder.SwapWay = (int)StationConstant.StationWay.Auto;
         swapOrder.CloudReportStatus = 0;
        _swapOrderRepository.Insert(swapOrder);
         return swapOrder;
diff --git a/WebStarter/WebStarter.csproj b/WebStarter/WebStarter.csproj
index 1330ba7..8d5c4fb 100644
--- a/WebStarter/WebStarter.csproj
+++ b/WebStarter/WebStarter.csproj
@@ -55,9 +55,9 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ApplicationDefinition Include="HybirdFrameworkCore.xml">
+      <Content Include="HybirdFrameworkCore.xml">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      </ApplicationDefinition>
+      </Content>
     </ItemGroup>
 
 </Project>