Novak Djokovic makes winning return in China