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

jhz

2022-06-16 c5209b15221aa6bf5e415efbe477e5554ff83d7c

 WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs

@@ -54,7 +54,6 @@
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;

            }
            catch (Exception e)
            {