Merge remote-tracking branch 'origin/master'

zengh

2021-12-04 2fdf30b77e0614f4785c7893a01958e8c8db8545

 src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java

@@ -254,8 +254,10 @@
                  "update blade_user set dispatch = " + "'" + user1.getDispatch() + "'" +
                     " " +"where id = " + "'" + user1.getId() + "'";
               FtpUtil.sqlFileUpload(s1);
            }else {
               //修改
               status = dispatcherService.updateById(dispatcher);
            }

      }
      return R.status(status);
   }