Merge remote-tracking branch 'origin/master'

zengh

2021-03-24 f34a510629676ebf22d75bde2e89e2fe4a2f56be

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/service/impl/SuserServiceImpl.java

@@ -72,8 +72,8 @@
   }

   @Override
   public void updateUser(String online_status, String account) {
      baseMapper.updateUser(online_status, account);
   public void updateUser(String online_status, String account,String workSt) {
      baseMapper.updateUser(online_status, account , workSt);
   }