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

ch

2022-05-24 22971886a0e1897aabf62b228215bbee3f2d5a6c

 WebAPI/Controllers/²©ÈÕ×Ô¶¯É¨ÂëÏß/ScanlineAPIController.cs

@@ -60,6 +60,7 @@
            }
            catch (Exception e)
            {
                LogService.Write("错误：" + e.Message.ToString());
                objJsonResult.status =-1;
                objJsonResult.msg = "生成箱条码失败！";
                objJsonResult.data =null;
@@ -215,6 +216,7 @@
            }
            catch (Exception e)
            {
                LogService.Write("箱条码绑定关系提交接口 æŠ›å‡ºå¼‚常" + e.Message.ToString());
                objJsonResult.status =-1;
                objJsonResult.msg = e.Message;
                objJsonResult.data = null;