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

yangle

2022-05-30 c7484c4ce600f47a4fe7862acf7ea8098bdbe64e

 WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs

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

            }
            catch (Exception e)
            {