Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

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

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

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

   @Override