Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-05-23 6e87185c84d90e242ad93e47567c4b5e2be0c8d7

 north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/UserMapper.java

@@ -28,4 +28,6 @@
    Boolean register(User user);

    List<String> getUserRole(Integer id);

    Boolean userDelete(Integer id);
}