resolve merge conflicts: keep theirs for all binary files

dytyqx

8 天以前 ba927b1faad68ab38d053ee9ea9eeac4b1a5531b

 WebAPI/Models/Gy_MateNumRelation_Sec.cs

@@ -27,5 +27,9 @@
        public string HCusRelationModel { get; set; }         //客户物料规格
        public long HTemplateID { get; set; }  //打印模板ID

        public string HRemark { get; set; }
        public long HCreateOrgID { get; set; }
        public long HUSEORGID { get; set; }
        public  string HShopID { get; set; } //小卫商品id
    }
}