Merge branch 'dev' into xiaoyang

wanshenmean

23 小时以前 5c6e99cb3b30e0b4127caa3b626c2b51ea038b61

 Code/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs

@@ -65,4 +65,14 @@
        [Description("入库撤销")]
        入库撤销 = 199,
    }
    /// <summary>
    /// 托盘类型
    /// </summary>
    public enum PalletTypesEmun
    {

        [Description("模切段")]
        模切段 = 1,

        [Description("卷绕段")]
        卷绕段 = 2,

    }
}