Merge remote-tracking branch 'origin/jtwy' into jtwy

yaowanxin

4 天以前 005e11377f508e3a79b528572a386a2af43697ca

 src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java

@@ -12,6 +12,7 @@
import com.ruoyi.project.system.mapper.*;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.BeanUtils;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;