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

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; }