Authored by weiqingting

Merge branch 'feature/qrcode' into develop