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

lizijie

2021-03-18 f1c3c5f0b840df7fa5fe08a69186c9f2b52ce243

 screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java

@@ -21,6 +21,7 @@
import com.moral.api.mapper.UserMapper;
import com.moral.api.service.UserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
import com.moral.util.AESUtils;
import com.moral.util.MD5Utils;
import com.moral.util.RegexUtils;
@@ -181,7 +182,7 @@
        } else {
            User user = new User();
            user.setId(userId);
            user.setIsDelete("1");
            user.setIsDelete(Constants.DELETE);
            userMapper.updateById(user);
        }
        return resultMap;