Merge remote-tracking branch 'origin/master'

linwe

2023-12-22 a780f6a807fd1a56f5f1ed8045407bf7e39cda2a

 src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java

@@ -187,7 +187,7 @@
         objectObjectHashMap.put("gridStatistics", gridStatistics);
         objectObjectHashMap.put("companyStatistics", companyStatistics);
      } else {
         Integer gridStatistics = baseMapper.getGridStatistics(code, AuthUtil.getUserId());
         Integer gridStatistics = baseMapper.getGridStatistics(code, null);
         Integer companyStatistics = baseMapper.getCompanyStatistics(code, null);
         objectObjectHashMap.put("gridStatistics", gridStatistics);
         objectObjectHashMap.put("companyStatistics", companyStatistics);