diff --git a/src/main/java/com/isu/gaswellwatch/controller/DeviceController.java b/src/main/java/com/isu/gaswellwatch/controller/DeviceController.java
index 6887b99..dd16517 100644
--- a/src/main/java/com/isu/gaswellwatch/controller/DeviceController.java
+++ b/src/main/java/com/isu/gaswellwatch/controller/DeviceController.java
@@ -41,7 +41,7 @@ public class DeviceController {
      * @return
      */
     @GetMapping(value = "/gasStation")
-    public List<GasStationVO> queryGasStationList(@RequestParam Long blockId,
+    public List<GasStationVO> queryGasStationList(@RequestParam(required = false) Long blockId,
                                                   @RequestParam String gasStationName) {
         return this.deviceService.queryGasStationList(blockId, gasStationName);
     }