Browse Source

Merge branch 'han' of uskycloud/usky-modules into server-165

hanzhengyi 1 year ago
parent
commit
2b732d020c

+ 10 - 10
service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/BaseGgpFacilityController.java

@@ -182,16 +182,16 @@ public class BaseGgpFacilityController {
         return ApiResult.success(baseGgpFacilityService.baseGgpFacilityList(baseGgpFacilityVO));
     }
 
-    /**
-     * 设施弹窗查询
-     *
-     * @param id  主键ID
-     * @return
-     */
-    @GetMapping("facilityPopInfo")
-    public ApiResult<List<Object>> facilityPopInfo(@RequestParam(value = "id") Integer id) {
-        return ApiResult.success(baseGgpFacilityService.facilityPopInfo(id));
-    }
+        /**
+         * 设施弹窗查询
+         *
+         * @param id  主键ID
+         * @return
+         */
+        @GetMapping("facilityPopInfo")
+        public ApiResult<List<Object>> facilityPopInfo(@RequestParam(value = "id") Integer id) {
+            return ApiResult.success(baseGgpFacilityService.facilityPopInfo(id));
+        }
 
     /**
      * 地理设施-导入

+ 0 - 0
service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/facilityImportVo.java → service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/FacilityImportVo.java