Shanghai set out plans on Monday for the end of a painful COVID-19 lockdown that has lasted more than six weeks, heavily bruising China's economy, and for the return of more normal life from June 1.