Merge branch 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

4 years ago · 5da4c1de8b
2 changed files with 4 additions and 4 deletions
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java
+++ b/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;
-}
+}
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcVaccineListResultDTO.java
+++ b/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;

    /**