Merge branch 'dev_1.0.0' into test_v1.0.0

joying-common/src/main/resources/mapper/NftMapper.xml

@@ -42,7 +42,7 @@
         c.category_name AS category
         FROM
         tb_nft n
-        LEFT JOIN tb_user u ON n.user_id = u.id
+        LEFT JOIN tb_user u ON n.publish_address = u.wallet
         LEFT JOIN tb_category c ON n.category_id = c.id
         WHERE
         is_commemorate=0 and nft_hash != ''