Merge branch 'master' into wxw

wxw

9 天以前 6a738089d6471d048c32ce7f3dcbd15c935ada79

 Admin.NET/WCS.Application/Entity/WcsCheckTask.cs

@@ -105,14 +105,14 @@
    /// 批次偏移量
    /// </summary>
    [Required]
    [SugarColumn(ColumnName = "PlcPos", ColumnDescription = "批次偏移量", Length = 10)]
    [SugarColumn(ColumnName = "PosLot", ColumnDescription = "批次偏移量", Length = 10)]
    public string PosLot { get; set; }

    /// <summary>
    /// 批次流程字类型
    /// </summary>
    [Required]
    [SugarColumn(ColumnName = "PosType", ColumnDescription = "批次流程字类型")]
    [SugarColumn(ColumnName = "PosTypeLot", ColumnDescription = "批次流程字类型")]
    public PLCDataTypeEnum PosTypeLot { get; set; }

    /// <summary>