Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java

@@ -874,17 +874,6 @@ public class PdaServiceImp implements PdaService {
         BasContainerDetails basContainer = basContainerDetails1.get(0);
         return agvRequest(basContainer.getContainerId(), startPoint, endPoint);
 
-//
-//        String result = HttpUtil.post("http://192.168.1.100:8080/agv/api/receiveAgvMoveJob", "startPoint=" + startPoint + "&endPoint=" + endPoint + "&containerCode=" + basContainer.getContainerId());
-//        //接口的返回结果为AjaxResult,从result中获取code
-//
-//        //获取code
-//        int code = JSONObject.parseObject(result).getIntValue("code");
-//        if (code == 200) {
-//            return AjaxResult.success(result);
-//        } else {
-//            return AjaxResult.warn(JSONObject.parseObject(result).getString("msg"));
-//        }
 
 
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -99,6 +99,7 @@ public class SysLoginController
     public AjaxResult changeLanguage(String lang)
     {
 
+
         return AjaxResult.success();
     }
 }