Merge branch 'lybDevelop'

luoyb

2021-02-19 f52362127751004c996ca9ee2f6f87d7e010b424

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java

@@ -258,6 +258,11 @@
    


    @FieldInfo(name = "dimissionType", type = "varchar", explain = "离职类型")
    @TableField("dimissionType")
    private String dimissionType;


    @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
    @TableField("createTime")
    @JsonSerialize(using = DateTimeSerializer.class)
@@ -288,7 +293,11 @@
    @TableField("version")
    @Version
    private Integer version = 0;
    

    @FieldInfo(name = "remark", type = "varchar", explain = "离职备注")
    @TableField("remark")
    private String remark = "";

   @TableField(exist = false)
   private String ageStr = "";