Merge branch 'master' of http://222.71.165.188:3000/yunxi/ningxiaWeb

the commit.

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/StationAreaController.java

@@ -246,9 +246,9 @@ public class StationAreaController {
         }
     }
 
-    @PostMapping("/getOthersArea/{id}")
+    @GetMapping("/getOthersArea")
     @Operation(summary = "获取非当前编辑的其他区域信息")
-    public ActionResult getOthersArea(@PathVariable(name = "id",required = false,value = "") String id) {
+    public ActionResult getOthersArea(@RequestParam(name = "id", required = false, value = "") String id) {
         List<StationAreaEntity> othersArea = stationAreaService.getOthersArea(id);
         return ActionResult.success(othersArea);
     }