Merge branch 'master' into dev

service/src/main/java/com/kym/service/admin/impl/StationServiceImpl.java

@@ -218,7 +218,7 @@ public class StationServiceImpl extends MyBaseServiceImpl<StationMapper, Station
         }
 
         String dataList = data.getString("dataList");
-        var equipmentRelations = JSON.parseArray(dataList, EquipmentRelation.class);
+        var equipmentRelations = JSON.parseArray(dataList, EquipmentRelation.class).stream().filter(item -> !CommUtil.isEmptyOrNull(item.getId())).toList();
 
         // t_station
         var stations = equipmentRelations.stream().filter(CommUtil.distinctByKey(EquipmentRelation::getStationId))