Merge branch 'lybDevelop'

luoyb

2021-02-19 8d59289c2232f73ca663a1a45b74ab21386780ca

 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= "";

}