Merge branch 'dev_zj' into dev

zss

2025-03-06 218c85f5128b95cedcc20127c60d1915bb1f7bc6

 cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceMaintenanceMapper.java

@@ -13,8 +13,5 @@
 */
@Mapper
public interface DeviceMaintenanceMapper extends BaseMapper<DeviceMaintenance> {
    List<DeviceMaintenance> getDeviceMaintenanceParam();


    List<DeviceMaintenanceExport> deviceMaintenanceExport(Integer deviceId);
}