Merge remote-tracking branch 'remotes/origin/develop' into 主线测试

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java

@@ -57,7 +57,7 @@ public class ExcelUtils {
         Workbook workbook = ExcelExportUtil.exportExcel(exportParams, pojoClass, list);
         Sheet sheet1 = workbook.getSheetAt(0);
         sheet1.setDefaultColumnWidth(50*256);
-        sheet1.setDefaultRowHeight((short)(2*256));
+        //sheet1.setDefaultRowHeight((short)(2*256));
         ServletOutputStream out = ExcelUtils.getOutputStreamForExcel(fileName,response);
         workbook.write(out);
         out.flush();

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java

@@ -212,7 +212,7 @@ public class IcTripReportRecordDTO implements Serializable {
     @ExcelIgnore
     private Boolean heSuanCheck;
 
-    @ColumnWidth(20)
+    @ColumnWidth(25)
     @ExcelProperty("核算检测关注名单")
     private String heSuanCheckDesc;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcVaccineListResultDTO.java

@@ -25,9 +25,9 @@ public class IcVaccineListResultDTO implements Serializable {
      */
     @ExcelIgnore
     private String agencyId;
-
+    @ExcelIgnore
     private String vaccineId;
-
+    @ExcelIgnore
     private String userId;
 
     /**