Merge branch 'devtruong' of https://gitlab.com/server-Dev3431352/blockchain-server into Binh-goldchart-mock