Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

zs

2025-05-06 44f6b5306f7927485c49d4655d370f4693cdabfd

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs

@@ -1,4 +1,4 @@
using CmsQueryExtensions.Extension;
using CmsQueryExtensions.Extension; 
using Volo.Abp.Application.Dtos;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
@@ -106,22 +106,22 @@
    /// <summary>
    /// å¤–径（单位：mm）
    /// </summary>
    public string OuterDiameter { get; set; }
        public decimal?  OuterDiameter { get; set; }

    /// <summary>
    /// å¤–径（单位：mm）-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum OuterDiameter_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;
        public SearchFilterModeEnum OuterDiameter_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

    /// <summary>
    /// å£åŽšï¼ˆå•ä½ï¼šmm）
    /// </summary>
    public string WallThickness { get; set; }
        public decimal?  WallThickness { get; set; }

    /// <summary>
    /// å£åŽšï¼ˆå•ä½ï¼šmm）-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum WallThickness_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;
        public SearchFilterModeEnum WallThickness_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

    /// <summary>
    /// æè´¨ï¼ˆå¦‚：304不锈钢）
@@ -136,12 +136,12 @@
    /// <summary>
    /// é•¿åº¦ï¼ˆå•ä½ï¼šm）
    /// </summary>
    public string Length { get; set; }
        public decimal?  Length { get; set; }

    /// <summary>
    /// é•¿åº¦ï¼ˆå•ä½ï¼šm）-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum Length_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;
        public SearchFilterModeEnum Length_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

    /// <summary>
    /// æ˜¯å¦ä¸ºä¸»æ”¯ç®¡
@@ -232,16 +232,6 @@
    /// æ˜¯å¦ç¦ç”¨-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum IsDisabled_FilterMode { get; set; } = SearchFilterModeEnum.精准查询;

    /// <summary>
    /// 
    /// </summary>
    public string ConcurrencyStamp { get; set; }

    /// <summary>
    /// -查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum ConcurrencyStamp_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;

    /// <summary>
    ///