Merge remote-tracking branch 'origin/master'

zengh

2021-04-23 670bc85ba8468dbe9a427abc54f2bca9d4e71749

 blade-ops/blade-report/src/main/java/org/springblade/report/service/impl/ReportFileServiceImpl.java

@@ -86,7 +86,6 @@
   public List<HealthcodeExcel> getHealthcodeList(String beanName, String dataName, Map<String,Object> map){
      //将map转换为json对象
      String s = JSON.toJSONString(map);
      System.out.println("s = " + s);
      if (null!=beanName){
         return reportClient.getHealthcodeList(s);
      }
@@ -152,7 +151,8 @@
      //将map转换为json对象
      String body = JSON.toJSONString(map);
      if (null!=beanName){
         return reportClient.getParcelList(body);
         List<ParcelExcel> parcelList = reportClient.getParcelList(body);
         return parcelList;
      }
      return null;
   }