fix merge

2024-07-22 14:43:28 +08:00
parent ded176ab30
commit 42deb7925e
1 changed files with 3 additions and 7 deletions
--- a/Src/Dlhis.Basic/Device/Response/DeviceTimePeriodResponse.cs
+++ b/Src/Dlhis.Basic/Device/Response/DeviceTimePeriodResponse.cs
@@ -3,20 +3,16 @@ using Dlhis.Entity.Device.Models;

 namespace Dlhis.Basic.Device.Response;

-public class DeviceTimePeriodResponse 
+public class DeviceTimePeriodResponse
 {
    public long Id { get; set; }
-    
-    /// <summary>
-    /// 名称
-    /// </summary>
-    public string Name { get; set; }
-    
+
    /// <summary>
    /// 名称
    /// </summary>
    public string Name { get; set; }

+    /// <summary>
    /// 卡类型
    /// </summary>
    public int CardType { get; set; }