Merge remote-tracking branch 'origin/master'

zengh

2021-12-04 2fdf30b77e0614f4785c7893a01958e8c8db8545

 src/main/java/org/springblade/modules/directive/controller/DirectiveController.java

@@ -65,7 +65,7 @@
   public R saveDirectiveAndFile(@RequestBody DirectiveVo directive) throws Exception {
      //新增指令信息
      boolean status = false;
      directive.setSendTime(new Date());
//      directive.setSendTime(new Date());
      status = directiveService.save(directive);
      //数据同步
      String s1 =