Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app

 Conflicts:

	pubspec.lock

lib/home/home_page.dart

@@ -507,6 +507,7 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
                 ),
                 Text(
                   goods.description,
+                  overflow: TextOverflow.ellipsis,
                   maxLines: 2,
                   style: TextStyle(
                       color: Color(0xFF727272),