Merge branch 'master' of http://dev.ccwin-in.com:6090/Win.Sfs.SmartSettlementSystem.PG

# Conflicts: # src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsJitOutPutDetialDto.cs
3 years ago · b0e42d37ee
1 changed files with 3 additions and 0 deletions
--- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsJitOutPutDetialDto.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Wms/WmsJitOutPutDetialDto.cs
@ -200,6 +200,9 @@ namespace Win.Sfs.SettleAccount.Entities.Wms
        //物料号
        public string MaterialCode { set; get; }

+   
+      
+
        [ImporterHeader(Name = "物料描述")]
        //物料描述
        public string MaterialDesc { set; get; }