Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-12 c5cf095903c50112f71612272911d53e9c86b7e0

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

@@ -85,5 +85,7 @@
    @TableField("labelId")
    private Long labelid;

    @TableField(exist = false)
    private String allDeptName;

}