Merge remote-tracking branch 'origin/master'

Houjie

10 天以前 a89bc32ac906ba535feae041fba5ae2b9adce9d9

 src/main/java/org/jeecg/modules/system/service/ISysUserService.java

@@ -363,4 +363,6 @@
    * @return
    */
   IPage<SysUser> getUserByFactoryId(Page<SysUser> page, String factoryId, String username);

    void editUser(SysUser sysUser);
}