Merge branch 'lybDevelop'

luoyb

2021-02-20 bedc1792239e77a46936bf9b175e324d57113bfe

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

@@ -112,5 +112,8 @@
    @TableField("version")
    @Version
    private Integer version = 0;
    
    @TableField(exist = false)
   private String remarkDateStr= "";

}