解决冲突

wyb

2021-05-26 7cacc9eb3f246fa46e94c0f557fd6f4e1a07bb94

 WebAPI/Models/M_StationBillMail.cs

@@ -14,5 +14,6 @@
        public string HICMOBillNo { get; set; }
        public int HEmpID { get; set; }
        public int HProcID { get; set; }
        public M_Department GetDepartment { get; set; }
    }
}