Merge remote-tracking branch 'origin/master'

Alan

2021-02-20 8bb9cf4117634383f45bc8e2be5c92993e5ef0b6

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

@@ -120,5 +120,8 @@
    @FieldInfo(name = "remark", type = "varchar", explain = "备注")
    @TableField("remark")
    private String remark = "";
    
    @TableField(exist = false)
   private String badDateStr= "";

}