Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-13 cd26732c2a34dbc3f24b0cca8d82e8a365fcba7b

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java

@@ -346,7 +346,7 @@
                }else if (file1.getName().indexOf("证")>=0){
                    accessory.setLabelid(143073812170753L);
                }else{
                    accessory.setLabelid(142445180372993L);
                    accessory.setLabelid(143073866696705L);
                }

                accessory.setCreatetime(new Date());