# Conflicts: # ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryDataMapper.java # ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml
# Conflicts: # ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryDataMapper.java # ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml