Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

guoyuji

2024-04-22 c581a6c396f1b367fe132bc302d6337b1ff0ad6f

 north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java

@@ -13,6 +13,7 @@
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

@@ -54,7 +55,7 @@
        return userMapper.getUserByID(userId);
    }


    @Transactional
    public User register(User user) {
        User returnUser = new User();
        if(userMapper.register(user)){