Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

chenhaozhe

5 天以前 2f695e7c0982d0de5c0cec5c16c5a3d574286773

 WebAPI/Models/Gy_WorkType.cs

@@ -21,14 +21,8 @@
        public string HForEmp { get; set; }   //短代码
        public string HRemark { get; set; }       //备注
        public string HUseFlag { get; set; }      //使用标志
<<<<<<< HEAD
       

       
=======



>>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
    }
}