Signed-off-by: ljx <809268652@qq.com>

ruoyi-system/src/main/java/com/ruoyi/system/domain/ContractTable.java

@@ -21,47 +21,47 @@ public class ContractTable extends BaseEntity
     private Long id;
 
     /** 证书类型 */
-    @Excel(name = "证书类型", readConverterExp = "0=个人会员证,1=团体会员证,2=企业会员证,3=理事聘书,4=一般聘书")
+    @Excel(name = "证书类型", readConverterExp = "0=个人会员证,1=团体会员证,2=企业会员证,3=理事聘书,4=一般聘书", type = Excel.Type.ALL)
     private Long certType;
 
     /** 姓名或者单位 */
-    @Excel(name = "姓名或者单位")
+    @Excel(name = "姓名或者单位",type = Excel.Type.ALL)
     private String dName;
 
     /** 身份证或者编码 */
-    @Excel(name = "身份证或者编码")
+    @Excel(name = "身份证或者编码",type = Excel.Type.ALL)
     private String dCode;
 
     /** 证书编码 */
-    @Excel(name = "证书编码")
+    @Excel(name = "证书编码",type = Excel.Type.ALL)
     private String certId;
 
     /** 专业委员会 */
-    @Excel(name = "专业委员会", readConverterExp = "0=天文教育,1=地理教育,2=中学数学教育,3=中学阅读与发展")
+    @Excel(name = "专业委员会", readConverterExp = "0=天文教育,1=地理教育,2=中学数学教育,3=中学阅读与发展",type = Excel.Type.ALL)
     private Integer certMajor;
 
     /** 发证时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "发证时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "发证时间", width = 30, dateFormat = "yyyy-MM-dd", type = Excel.Type.ALL)
     private Date issueDate;
 
     /** 证书有效期 */
-    @Excel(name = "证书有效期")
+    @Excel(name = "证书有效期",type = Excel.Type.ALL)
     private String validTerm;
 
     /** 邮箱 */
-    @Excel(name = "邮箱")
+    @Excel(name = "邮箱",type = Excel.Type.ALL)
     private String dEmail;
 
     /** 手机号 */
-    @Excel(name = "手机号")
+    @Excel(name = "手机号",type = Excel.Type.ALL)
     private String dPhone;
 
     /** 导入系统的时间戳 */
     private Date updateDate;
 
     /** 证书文字 */
-    @Excel(name = "证书文字")
+    @Excel(name = "证书文字",type = Excel.Type.ALL)
     private String certContent;
 
     public void setId(Long id) 

ruoyi-system/src/main/java/com/ruoyi/system/domain/GradTable.java

@@ -18,58 +18,58 @@ public class GradTable extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 姓名 */
-    @Excel(name = "姓名")
+    @Excel(name = "姓名",type = Excel.Type.ALL)
     private String uesrName;
 
     /** 身份证 */
-    @Excel(name = "身份证")
+    @Excel(name = "身份证",type = Excel.Type.ALL)
     private String userId;
 
     /** 证书编号 */
-    @Excel(name = "证书编号")
+    @Excel(name = "证书编号",type = Excel.Type.ALL)
     private String certId;
 
     /** 发证时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "发证时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "发证时间", width = 30, dateFormat = "yyyy-MM-dd",type = Excel.Type.ALL)
     private Date issueDate;
 
     /** 培训名称 */
-    @Excel(name = "培训名称")
+    @Excel(name = "培训名称",type = Excel.Type.ALL)
     private String certName;
 
     /** 课程名称 */
-    @Excel(name = "课程名称")
+    @Excel(name = "课程名称",type = Excel.Type.ALL)
     private String courseName;
 
     /** 学时数 */
-    @Excel(name = "学时数")
+    @Excel(name = "学时数",type = Excel.Type.ALL)
     private String courseHours;
 
     /** 等级 */
-    @Excel(name = "等级")
+    @Excel(name = "等级",type = Excel.Type.ALL)
     private String level;
 
     /** 培训起始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "培训起始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "培训起始时间", width = 30, dateFormat = "yyyy-MM-dd",type = Excel.Type.ALL)
     private Date startDate;
 
     /** 培训截止时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "培训截止时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "培训截止时间", width = 30, dateFormat = "yyyy-MM-dd",type = Excel.Type.ALL)
     private Date endDate;
 
     /** 照片 */
-    @Excel(name = "照片")
+    @Excel(name = "照片",type = Excel.Type.ALL)
     private String picture;
 
     /** 手机号码 */
-    @Excel(name = "手机号码")
+    @Excel(name = "手机号码",type = Excel.Type.ALL)
     private String userPhone;
 
     /** 邮箱 */
-    @Excel(name = "邮箱")
+    @Excel(name = "邮箱",type = Excel.Type.ALL)
     private String userEmail;
 
     /** 导入系统的时间戳 */
@@ -79,7 +79,7 @@ public class GradTable extends BaseEntity
     private Long id;
 
     /** 证书类型 */
-    @Excel(name = "证书类型", readConverterExp = "0=专业能力证书,1=培训结业证书,2=学时证明")
+    @Excel(name = "证书类型", readConverterExp = "0=专业能力证书,1=培训结业证书,2=学时证明",type = Excel.Type.ALL)
     private Long certType;
 
     public void setUesrName(String uesrName)