Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-03-29 6c17e1f3da486ffd16b7237d9bc35a9bcbef5348

 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)){