chore: 合并失败

gongchunyi

3 天以前 b4c3f13af821d10a0ada7164bda95f23bac206e5

 src/main/java/com/ruoyi/project/system/service/ISysUserService.java

@@ -210,4 +210,11 @@
     * @return

     */

    List<SysUser> userListNoPage(SysUser user);



    /**

     * 绑定用户部门

     * @param user

     * @return

     */

    int bindUserDept(SysUser user);

}