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

yangle

2022-04-24 66692fe72e71ba61e7435d7fb258429eee44b8b5

 WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs

@@ -154,7 +154,7 @@
                    return objJsonResult;
                }
                //得到信息
                ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_EquipFileMainList  where HBarCode = '" + HBarCode + "'", "h_v_Gy_EquipFileMainList");
                ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_EquipFileMainList  where 条形码 = '" + HBarCode + "'", "h_v_Gy_EquipFileMainList");
                //ds = oWebs.get_InfoByBarCode(HBarCode, ref DBUtility.ClsPub.sErrInfo);
                //写入信息
                if (ds == null)