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

llj

昨天 a91fdba94705dd25cecccc7a4a5dcc2b3f2c09a6

 WebAPI/Controllers/CJGL/Cj_SingleStationController.cs

@@ -3700,7 +3700,7 @@

                oCN.RunProc(sql);//插入蓝牙测试数据

                objJsonResult.code = "1";
                objJsonResult.code = "success";
                objJsonResult.count = 1;
                objJsonResult.Message = "蓝牙测试数据接收成功！lotSn：" + lotSn;
                objJsonResult.data = null;
@@ -3708,7 +3708,7 @@
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.code = "error";
                objJsonResult.count = 0;
                objJsonResult.Message = "发生异常！" + e.ToString();
                objJsonResult.data = null;