Merge branch 'master' into csc

chengsc

5 天以前 2d809c12abe87c21d6090ce6c5b3c75959cf4a2b

 Wms/Model/ModelVm/BllAsnVm/ArrivalNoticeDetailVm.cs

@@ -147,6 +147,11 @@
        public string Lot6 { get; set; }

        /// <summary>
        /// 标签常值
        /// </summary>
        public string BoxCodeStr { get; set; }

        /// <summary>
        /// 自定义列1
        /// </summary>
        public string UDF1 { get; set; }