From 3d3d4409d0c3cccef1321ff9cc06bf60aa7a6655 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周四, 08 5月 2025 17:44:14 +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.Domain/WmsMaterial/WmsMaterial.cs |   19 +++----------------
 1 files changed, 3 insertions(+), 16 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.Domain/WmsMaterial/WmsMaterial.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.Domain/WmsMaterial/WmsMaterial.cs"
index eee2ed5..a27c363 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.Domain/WmsMaterial/WmsMaterial.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.Domain/WmsMaterial/WmsMaterial.cs"
@@ -1,5 +1,6 @@
 using CMS.Plugin.HIAWms.Domain.Shared.Enums;
 using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterial;
+using CmsQueryExtensions.Extension;
 using MathNet.Numerics;
 using Volo.Abp;
 using Volo.Abp.Domain.Entities.Auditing;
@@ -9,7 +10,7 @@
     /// <summary>
     /// WmsMaterial
     /// </summary>
-    public class WmsMaterial : FullAuditedAggregateRoot<Guid>
+    public class WmsMaterial : MyFullAuditedAggregateRoot<Guid>
     {
         /// <summary>
         /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
@@ -91,21 +92,7 @@
         /// </summary>
         public string RedundantField3 { get; set; }
 
-        /// <summary>
-        /// 鎺掑簭
-        /// </summary>
-        public virtual int Sort { get; set; }
-
-        /// <summary>
-        /// 澶囨敞
-        /// </summary>
-        public virtual string Remark { get; set; }
-
-        /// <summary>
-        /// 鏄惁绂佺敤
-        /// </summary>
-        public virtual bool? IsDisabled { get; set; }
-
+       
         /// <summary>
         /// Adjusts the sort.
         /// </summary>

--
Gitblit v1.9.3