From fc5e4859a2e06f44a848141aef99ec4930b42e1f Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Tue, 29 Sep 2020 17:05:30 +0800
Subject: [PATCH] 1.0.0.20092902

Former-commit-id: 5a8946bafcbb55c5c03ca0953a6dabcb7a6dec12
Former-commit-id: 41f0384f3eded2a24f3a42743ba7478d9e892613
---
 projects/IoT.Shared/Application/Models/EditProductModel.cs    | 4 ++--
 .../IoT.Shared/Areas/Admin/Controlls/ProductController.cs     | 3 ++-
 projects/Version.cs                                           | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/projects/IoT.Shared/Application/Models/EditProductModel.cs b/projects/IoT.Shared/Application/Models/EditProductModel.cs
index f764001c..6a279828 100644
--- a/projects/IoT.Shared/Application/Models/EditProductModel.cs
+++ b/projects/IoT.Shared/Application/Models/EditProductModel.cs
@@ -25,8 +25,8 @@ namespace Application.Models
         [Display(Name = "路径")]
         public string Path { get; set; }
 
-        [Display(Name = "序号")]
-        public int DisplayOrder { get; set; }
+        //[Display(Name = "序号")]
+        //public int DisplayOrder { get; set; }
 
         [Display(Name = "ApiJson")]
         [DataType(DataType.MultilineText)]
diff --git a/projects/IoT.Shared/Areas/Admin/Controlls/ProductController.cs b/projects/IoT.Shared/Areas/Admin/Controlls/ProductController.cs
index abd8a1f7..089ea197 100644
--- a/projects/IoT.Shared/Areas/Admin/Controlls/ProductController.cs
+++ b/projects/IoT.Shared/Areas/Admin/Controlls/ProductController.cs
@@ -35,7 +35,8 @@ namespace IoT.Shared.Areas.Admin.Controlls
                 .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name, StringComparison.OrdinalIgnoreCase))
                 .WhereIf(!string.IsNullOrEmpty(model.Query.Number), o => o.Number.Contains(model.Query.Number, StringComparison.OrdinalIgnoreCase))
                 .WhereIf(!string.IsNullOrEmpty(model.Query.Path), o => o.Path.Contains(model.Query.Path, StringComparison.OrdinalIgnoreCase))
-                .WhereIf(!string.IsNullOrEmpty(model.Query.ApiJson), o => o.ApiJson.Contains(model.Query.ApiJson, StringComparison.OrdinalIgnoreCase));
+                .WhereIf(!string.IsNullOrEmpty(model.Query.ApiJson), o => o.ApiJson.Contains(model.Query.ApiJson, StringComparison.OrdinalIgnoreCase))
+                .OrderBy(o => o.DisplayOrder);
         }
 
         public override void ToDisplayModel(Product entity, EditProductModel model)
diff --git a/projects/Version.cs b/projects/Version.cs
index 2a4da173..70945843 100644
--- a/projects/Version.cs
+++ b/projects/Version.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0.20092901")]
\ No newline at end of file
+[assembly: AssemblyInformationalVersion("1.0.0.20092902")]
\ No newline at end of file