Merge remote-tracking branch 'origin/master'

luoyb

2021-04-23 b7e12f6bfcf7d42169dffa5f169843e714833b6a

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/vo/EmpAccessoryVO.java

@@ -22,4 +22,6 @@
    private String empType;
    private String entryType;
    private String fileName;
    private String field;
    private String order;
}