Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-13 cd26732c2a34dbc3f24b0cca8d82e8a365fcba7b

 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;

}