Merge branch 'master' into djp

test

14 小时以前 c5dc821692c0529e3a688af84c647bf80cc49360

 Wms/Model/InterFaceModel/AsnModels.cs

@@ -78,7 +78,7 @@
        public string HouseNo { get; set; }
        public string RoadwayNo { get; set; }
        public string Ceng { get; set; }
        public int palletNum { get; set; }
        public int PallNum { get; set; }

        public string locate { get; set; }