Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-08-28 a79f7d80e55319ae1a40954f6a4ce6e382cc1649

 server/src/main/java/doumeemes/service/ext/DeviceExtService.java

@@ -29,10 +29,4 @@
    List<DeviceExtListVO> getDeviceByCondition(QueryDeviceExtDTO queryDeviceExtDTO);


    /**
     * 获取批量导入设备信息
     *
     * @param file
     */
    void importPlans(MultipartFile file);
}