Study on amalgamation of the logistics industry and manufacturing industry — Shanghai’s case study