From 0cd95d98fdf7ed22d53398242feb2a3ca185cf09 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 13 5月 2025 15:38:35 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs |  587 ++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 349 insertions(+), 238 deletions(-)

diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs"
index b1fb428..150f658 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs"
@@ -1,311 +1,422 @@
-using CmsQueryExtensions.Extension;
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
-
+using CMS.Plugin.HIAWms.Domain.Shared.Enums; 
+using CmsQueryExtensions.Extension; 
+using Volo.Abp.Application.Dtos; 
+ 
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; 
+ 
 /// <summary> 
 /// 鐗╂枡鍩虹淇℃伅琛ㄦ煡璇㈠弬鏁� 
 /// </summary> 
-public class GetWmsMaterialInput : ExtensiblePagedAndSortedResultRequestDto
-{
-
+public class GetWmsMaterialInput : ExtensiblePagedAndSortedResultRequestDto 
+{ 
+ 
     #region 鍏抽敭瀛楁煡璇� 
-
+ 
     /// <summary> 
     /// 鍏抽敭瀛楁ā绯婃煡璇紙娉ㄦ剰鏄皬鍐欙紒锛� 
     /// </summary> 
-    public string searchVal { get; set; }
-
+    public string searchVal { get; set; } 
+ 
     /// <summary> 
     /// 閫氱敤鏌ヨ閰嶇疆 (1:妯＄硦鏌ヨ , 2:绮惧噯鏌ヨ)锛堟敞鎰忔槸灏忓啓锛侊級 
     /// </summary> 
-    public SearchFilterModeEnum searchVal_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
-
+    public SearchFilterModeEnum searchVal_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ; 
+ 
     /// <summary> 
     /// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級 
     /// </summary> 
-    [NoAutoQuery]
-    public string str_searchFormInputAttrs { get; set; }
+    [NoAutoQuery] 
+    public string str_searchFormInputAttrs { get; set; } 
     /// <summary> 
     /// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級 
     /// </summary> 
-    public List<string> searchFormInputAttrs
-    {
-        get
-        {
-            if (!string.IsNullOrEmpty(str_searchFormInputAttrs))
-            {
-                return str_searchFormInputAttrs.Split(',').ToList();
-            }
-            return new List<string>();
-        }
-    }
+    public List<string> searchFormInputAttrs 
+    { 
+        get 
+        { 
+            if (!string.IsNullOrEmpty(str_searchFormInputAttrs)) 
+            { 
+                return str_searchFormInputAttrs.Split(',').ToList(); 
+            } 
+            return new List<string>(); 
+        } 
+    } 
+ 
+    #endregion 
+ 
+            /// <summary>
+        /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
+        /// </summary>
+        public string MaterialCode { get; set; }
 
-    #endregion
+        /// <summary>
+        /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum MaterialCode_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-    /// <summary>
-    /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
-    /// </summary>
-    public string MaterialCode { get; set; }
+        /// <summary>
+        /// 鏄惁鏈夋晥鐗╂枡
+        /// </summary>
+        public bool?  IsValid { get; set; }
 
-    /// <summary>
-    /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�-鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum MaterialCode_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+        /// <summary>
+        /// 鏄惁鏈夋晥鐗╂枡-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum IsValid_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-    /// <summary>
-    /// 鐗╂枡鍚嶇О
-    /// </summary>
-    public string MaterialName { get; set; }
+        /// <summary>
+        /// 鏄惁鑷骇
+        /// </summary>
+        public bool?  IsSelfMade { get; set; }
 
-    /// <summary>
-    /// 鐗╂枡鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum MaterialName_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+        /// <summary>
+        /// 鏄惁鑷骇-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum IsSelfMade_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-    /// <summary>
-    /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
-    /// </summary>
-    public int? PurchaseType { get; set; }
+        /// <summary>
+        /// 鏁伴噺
+        /// </summary>
+        public int?  Num { get; set; }
 
-    /// <summary>
-    /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級-鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum PurchaseType_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
+        /// <summary>
+        /// 鏁伴噺-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum Num_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-    /// <summary>
-    /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
-    /// </summary>
-    public int? MaterialType { get; set; }
+        /// <summary>
+        /// 鑷湁鏁伴噺
+        /// </summary>
+        public int?  SelfNum { get; set; }
 
-    /// <summary>
-    /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級-鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum MaterialType_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
+        /// <summary>
+        /// 鑷湁鏁伴噺-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum SelfNum_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-    /// <summary>
-    /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
-    /// </summary>
-    public string PrimaryUnit { get; set; }
+        /// <summary>
+        /// 鐗╂枡鍚嶇О
+        /// </summary>
+        public string MaterialName { get; set; }
 
-    /// <summary>
-    /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�-鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum PrimaryUnit_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+        /// <summary>
+        /// 鐗╂枡鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum MaterialName_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-    /// <summary>
-    /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�
-    /// </summary>
-    public string Standard { get; set; }
+        /// <summary>
+        /// 鍙┖闀垮害
+        /// </summary>
+        public decimal?  NullLength { get; set; }
 
-    /// <summary>
-    /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�-鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum Standard_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+        /// <summary>
+        /// 鍙┖闀垮害-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum NullLength_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-    /// <summary>
-    /// 澶栧緞锛堝崟浣嶏細mm锛�
-    /// </summary>
-    public string OuterDiameter { get; set; }
+        /// <summary>
+        /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
+        /// </summary>
+        public PurchaseTypeEnum?  PurchaseType { get; set; }
 
-    /// <summary>
-    /// 澶栧緞锛堝崟浣嶏細mm锛�-鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum OuterDiameter_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+        /// <summary>
+        /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum PurchaseType_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-    /// <summary>
-    /// 澹佸帤锛堝崟浣嶏細mm锛�
-    /// </summary>
-    public string WallThickness { get; set; }
+        /// <summary>
+        /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
+        /// </summary>
+        public MaterialTypeEnum?  MaterialType { get; set; }
 
-    /// <summary>
-    /// 澹佸帤锛堝崟浣嶏細mm锛�-鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum WallThickness_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+        /// <summary>
+        /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum MaterialType_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-    /// <summary>
-    /// 鏉愯川锛堝锛�304涓嶉攬閽級
-    /// </summary>
-    public string MaterialQuality { get; set; }
+        /// <summary>
+        /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
+        /// </summary>
+        public string PrimaryUnit { get; set; }
 
-    /// <summary>
-    /// 鏉愯川锛堝锛�304涓嶉攬閽級-鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum MaterialQuality_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+        /// <summary>
+        /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum PrimaryUnit_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-    /// <summary>
-    /// 闀垮害锛堝崟浣嶏細m锛�
-    /// </summary>
-    public string Length { get; set; }
+        /// <summary>
+        /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�
+        /// </summary>
+        public string Standard { get; set; }
 
-    /// <summary>
-    /// 闀垮害锛堝崟浣嶏細m锛�-鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum Length_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+        /// <summary>
+        /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum Standard_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-    /// <summary>
-    /// 鏄惁涓轰富鏀
-    /// </summary>
-    public int? IsMainBranch { get; set; }
+        /// <summary>
+        /// 澶栧緞锛堝崟浣嶏細mm锛�
+        /// </summary>
+        public decimal?  OuterDiameter { get; set; }
 
-    /// <summary>
-    /// 鏄惁涓轰富鏀-鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum IsMainBranch_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
+        /// <summary>
+        /// 澶栧緞锛堝崟浣嶏細mm锛�-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum OuterDiameter_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-    /// <summary>
-    /// 鐢熶骇宸ュ巶
-    /// </summary>
-    public string Factory { get; set; }
+        /// <summary>
+        /// 澹佸帤锛堝崟浣嶏細mm锛�
+        /// </summary>
+        public decimal?  WallThickness { get; set; }
 
-    /// <summary>
-    /// 鐢熶骇宸ュ巶-鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum Factory_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+        /// <summary>
+        /// 澹佸帤锛堝崟浣嶏細mm锛�-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum WallThickness_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-    /// <summary>
-    /// 璇佷功缂栧彿
-    /// </summary>
-    public string Certification { get; set; }
+        /// <summary>
+        /// 鏉愯川锛堝锛�304涓嶉攬閽級
+        /// </summary>
+        public string MaterialQuality { get; set; }
 
-    /// <summary>
-    /// 璇佷功缂栧彿-鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum Certification_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+        /// <summary>
+        /// 鏉愯川锛堝锛�304涓嶉攬閽級-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum MaterialQuality_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-    /// <summary>
-    /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
-    /// </summary>
-    public string RedundantField1 { get; set; }
+        /// <summary>
+        /// 闀垮害锛堝崟浣嶏細m锛�
+        /// </summary>
+        public decimal?  Length { get; set; }
 
-    /// <summary>
-    /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��-鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum RedundantField1_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+        /// <summary>
+        /// 闀垮害锛堝崟浣嶏細m锛�-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum Length_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-    /// <summary>
-    /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
-    /// </summary>
-    public string RedundantField2 { get; set; }
+        /// <summary>
+        /// 鏄惁涓轰富鏀
+        /// </summary>
+        public YesNoEnum?  IsMainBranch { get; set; }
 
-    /// <summary>
-    /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��-鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum RedundantField2_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+        /// <summary>
+        /// 鏄惁涓轰富鏀-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum IsMainBranch_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-    /// <summary>
-    /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
-    /// </summary>
-    public string RedundantField3 { get; set; }
+        /// <summary>
+        /// 鐢熶骇宸ュ巶
+        /// </summary>
+        public string Factory { get; set; }
 
-    /// <summary>
-    /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��-鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum RedundantField3_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+        /// <summary>
+        /// 鐢熶骇宸ュ巶-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum Factory_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-    /// <summary>
-    /// 鎺掑簭
-    /// </summary>
-    public int? Sort { get; set; }
+        /// <summary>
+        /// 璇佷功缂栧彿
+        /// </summary>
+        public string Certification { get; set; }
 
-    /// <summary>
-    /// 鎺掑簭-鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum Sort_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
+        /// <summary>
+        /// 璇佷功缂栧彿-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum Certification_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-    /// <summary>
-    /// 澶囨敞
-    /// </summary>
-    public string Remark { get; set; }
+        /// <summary>
+        /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
+        /// </summary>
+        public string RedundantField1 { get; set; }
 
-    /// <summary>
-    /// 澶囨敞-鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum Remark_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+        /// <summary>
+        /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum RedundantField1_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-    /// <summary>
-    /// 鏄惁绂佺敤
-    /// </summary>
-    public bool? IsDisabled { get; set; }
+        /// <summary>
+        /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
+        /// </summary>
+        public string RedundantField2 { get; set; }
 
-    /// <summary>
-    /// 鏄惁绂佺敤-鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum IsDisabled_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
+        /// <summary>
+        /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum RedundantField2_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-    /// <summary>
-    /// 
-    /// </summary>
-    public string ConcurrencyStamp { get; set; }
+        /// <summary>
+        /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
+        /// </summary>
+        public string RedundantField3 { get; set; }
 
-    /// <summary>
-    /// -鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum ConcurrencyStamp_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+        /// <summary>
+        /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum RedundantField3_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-    /// <summary>
-    /// 
-    /// </summary>
-    //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
-    [HighSearchRangeAttribute]
-    public List<string> CreationTime { get; set; }
+        /// <summary>
+        /// 鎺掑簭
+        /// </summary>
+        public int?  Sort { get; set; }
+
+        /// <summary>
+        /// 鎺掑簭-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum Sort_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+        /// <summary>
+        /// 澶囨敞
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 澶囨敞-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum Remark_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+        /// <summary>
+        /// 鏄惁绂佺敤
+        /// </summary>
+        public bool?  IsDisabled { get; set; }
+
+        /// <summary>
+        /// 鏄惁绂佺敤-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum IsDisabled_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+        /// <summary>
+        /// 鍒涘缓鏃堕棿
+        /// </summary>
+        //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+        [HighSearchRangeAttribute]
+        public string CreationTime { get; set; }
 
 
-    /// <summary>
-    /// 
-    /// </summary>
-    public string CreatorId { get; set; }
+        /// <summary>
+        /// 鍒涘缓浜篒D
+        /// </summary>
+        public string CreatorId { get; set; }
 
-    /// <summary>
-    /// -鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum CreatorId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+        /// <summary>
+        /// 鍒涘缓浜篒D-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum CreatorId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-    /// <summary>
-    /// 
-    /// </summary>
-    //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
-    [HighSearchRangeAttribute]
-    public List<string> LastModificationTime { get; set; }
+        /// <summary>
+        /// 淇敼鏃堕棿
+        /// </summary>
+        //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+        [HighSearchRangeAttribute]
+        public string LastModificationTime { get; set; }
 
 
-    /// <summary>
-    /// 
-    /// </summary>
-    public string LastModifierId { get; set; }
+        /// <summary>
+        /// 淇敼浜篒D
+        /// </summary>
+        public string LastModifierId { get; set; }
 
-    /// <summary>
-    /// -鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum LastModifierId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+        /// <summary>
+        /// 淇敼浜篒D-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum LastModifierId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-    /// <summary>
-    /// 
-    /// </summary>
-    public bool? IsDeleted { get; set; }
+        /// <summary>
+        /// 鏄惁鍒犻櫎
+        /// </summary>
+        public bool?  IsDeleted { get; set; }
 
-    /// <summary>
-    /// -鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum IsDeleted_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
+        /// <summary>
+        /// 鏄惁鍒犻櫎-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum IsDeleted_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
 
-    /// <summary>
-    /// 
-    /// </summary>
-    public string DeleterId { get; set; }
+        /// <summary>
+        /// 鍒犻櫎浜篒D
+        /// </summary>
+        public string DeleterId { get; set; }
 
-    /// <summary>
-    /// -鏌ヨ鍏崇郴杩愮畻绗� 
-    /// </summary>
-    public SearchFilterModeEnum DeleterId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+        /// <summary>
+        /// 鍒犻櫎浜篒D-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum DeleterId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
 
-    /// <summary>
-    /// 
-    /// </summary>
-    //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
-    [HighSearchRangeAttribute]
-    public List<string> DeletionTime { get; set; }
+        /// <summary>
+        /// 鍒犻櫎鏃堕棿
+        /// </summary>
+        //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+        [HighSearchRangeAttribute]
+        public string DeletionTime { get; set; }
 
 
+        /// <summary>
+        /// 鍒涘缓浜�
+        /// </summary>
+        public string CreatorName { get; set; }
 
-}
+        /// <summary>
+        /// 鍒涘缓浜�-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum CreatorName_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+        /// <summary>
+        /// 淇敼浜�
+        /// </summary>
+        public string LastModifierName { get; set; }
+
+        /// <summary>
+        /// 淇敼浜�-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum LastModifierName_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+        /// <summary>
+        /// 鎿嶄綔澶囨敞
+        /// </summary>
+        public string OperationRemark { get; set; }
+
+        /// <summary>
+        /// 鎿嶄綔澶囨敞-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum OperationRemark_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+        /// <summary>
+        /// 鍒犻櫎澶囨敞
+        /// </summary>
+        public string DeleteRemark { get; set; }
+
+        /// <summary>
+        /// 鍒犻櫎澶囨敞-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum DeleteRemark_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+        /// <summary>
+        /// 鎵╁睍瀛楁1
+        /// </summary>
+        public string ExtraField1 { get; set; }
+
+        /// <summary>
+        /// 鎵╁睍瀛楁1-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum ExtraField1_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+        /// <summary>
+        /// 鎵╁睍瀛楁2
+        /// </summary>
+        public string ExtraField2 { get; set; }
+
+        /// <summary>
+        /// 鎵╁睍瀛楁2-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum ExtraField2_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+        /// <summary>
+        /// 鎵╁睍瀛楁3
+        /// </summary>
+        public string ExtraField3 { get; set; }
+
+        /// <summary>
+        /// 鎵╁睍瀛楁3-鏌ヨ鍏崇郴杩愮畻绗� 
+        /// </summary>
+        public SearchFilterModeEnum ExtraField3_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+ 
+} 

--
Gitblit v1.9.3