Am I need à visa g or can I obtain a free 24h visa when I will arrive in kunming?

I bought a flight from kathmandou to osaka with 2 stops in china (kunming and Shanghai). I arrive in kunming the 9th of june at 20h 30. I leave kunming the 10th of june at 8h, arrive in Shanghai at 11h30 and leave Shanghai at 18h to japan. Actually I will stay less than 24h in china.
Ps : I have to pick my luggage in kunming and go outside the transit area

thanks you for your answer.

Nicolas (France)