Merge remote-tracking branch 'origin/master'

cuilei

19 小时以前 76c5ad320495758d4e76d852d96914f1b405ece7

 src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -832,4 +832,9 @@
   public IPage<SysUser> getUserByFactoryId(Page<SysUser> page, String factoryId, String username) {
      return userMapper.getUserByFactoryId(page,factoryId,username);
   }

   @Override
   public void editUser(SysUser sysUser) {
      userMapper.updateById(sysUser);
   }
}