Commit ece5be14 by jiang'yun

修改问题

parent 728ea388
package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.core.domain.OurBaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
......@@ -106,6 +107,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
* 现职称(1无、2初级、3中级、4副高、5正高)
*/
@Excel(name = "现具备专技资格")
@TableField("current_professional_title")
private String currentProfessionalTitle;
/**
......@@ -113,12 +115,14 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
*/
@Excel(name = "现具备专技资格时间")
// @JsonFormat(pattern = "yyyy-MM-dd")
@TableField("current_professional_title_time")
private Date currentProfessionalTitleTime;
/**
* 现聘职称(1无、2初级、3中级、4副高、5正高)
*/
@Excel(name = "现聘专技资格")
@TableField("current_hiring_professional_title")
private String currentHiringProfessionalTitle;
/**
......@@ -126,6 +130,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
*/
@Excel(name = "现聘专技资格时间")
// @JsonFormat(pattern = "yyyy-MM-dd")
@TableField("current_hiring_professional_title_time")
private Date currentHiringProfessionalTitleTime;
/**
......
......@@ -124,7 +124,7 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity {
* 现职称取得资格时间
*/
@Excel(name = "现具备专技资格时间" ,dateFormat="yyyy-MM")
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM")
private Date currentProfessionalTitleTime;
/**
......@@ -136,7 +136,7 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity {
/**
* 现职称聘任时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM")
@Excel(name = "现聘专技资格时间" ,dateFormat="yyyy-MM")
private Date currentHiringProfessionalTitleTime;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment