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

yangle

2022-10-19 7f15f2efc5dcf98a3b46cb156db24b71cb45e9df

 WebAPI/Controllers/BaseSet/Gy_WorkTypeController.cs

@@ -290,7 +290,7 @@
            try
            {
                //删除权限
                //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;