Merge remote-tracking branch 'origin/master'

zengh

2022-03-03 bc493033ebc2ab2bea86626f3cc66727cb993b7e

 src/main/java/org/springblade/modules/energy/service/impl/EnergyServiceImpl.java

@@ -48,8 +48,13 @@
   }

   @Override
   public void updateEnergyId(String id) {
      baseMapper.updateEnergyId(id);
   public void updateEnergyId(String id,String identification) {
      baseMapper.updateEnergyId(id,identification);
   }

   @Override
   public void updateEnergyIds(Integer id, String identification) {
      baseMapper.updateEnergyIds(id,identification);
   }

   @Override