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

ch

2022-12-01 34c3b4b4a135316adb353f110fb1bd95c653ccad

 WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs

@@ -44,22 +44,12 @@
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipMaintainPlan");
                }

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
               
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception ex)
            {