合并冲突

chenhaozhe

5 天以前 47b45a4ac3284936515a2edd3e50265de30993a0

 WebAPI/Models/Sc_WorkBillSortBillMain.cs

@@ -70,5 +70,7 @@
        public string HMastersDate { get; set; }
        public DateTime? HMakeDate { get; set; }
        public string sWheres { get; set; }

        public string HVersion_Import { get; set; }
    }
}