Merge remote-tracking branch 'origin/master'

luoyb

2021-05-31 3ae6bd194fe1f17b4f5d96cb78b057705e5d0d78

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/task/ScheduledTask.java

@@ -42,11 +42,11 @@
    @Scheduled(cron = "0 0 2 * * ?")
    public void updateDeptName(){
        log.info("每天凌晨2点更新部门名称和全称");
        empBaseInfoService.updateDeptName();
        // empBaseInfoService.updateDeptName();
    }
    @Override
    public void run(String... args) throws Exception {
        calculateSeniority();
        updateDeptName();
        // updateDeptName();
    }
}