Merge branch 'dev_1.0.0' into test_v1.0.0

joying-admin/src/main/java/com/fzm/admin/controller/NftController.java

@@ -30,7 +30,7 @@ public class NftController {
     @ApiOperation(value = "查询nft列表")
     public ResponseModel<PageInfo<NftListVo>> list(@ApiParam(value = "页码", required = true) @RequestParam Integer pageNum,
                                                    @ApiParam(value = "每页记录数", required = true) @RequestParam Integer pageSize,
-                                                   @ApiParam(value = "类目id") @RequestParam(required = false, defaultValue = "1") Integer categoryId,
+                                                   @ApiParam(value = "类目id") @RequestParam(required = false) Integer categoryId,
                                                    @ApiParam(value = "作品名称") @RequestParam(required = false) String name,
                                                    @ApiParam(value = "作品标签") @RequestParam(required = false) String theme,
                                                    @ApiParam(value = "注册手机号") @RequestParam(required = false) String telephone,

joying-common/src/main/java/com/fzm/common/entity/vo/NftListVo.java

@@ -18,6 +18,9 @@ public class NftListVo {
     @ApiModelProperty("名称")
     private String name;
 
+    @ApiModelProperty("类别")
+    private String category;
+
     @ApiModelProperty("主题,多个用逗号,隔开")
     private String theme;
 

joying-common/src/main/java/com/fzm/common/service/impl/NftServiceImpl.java

@@ -287,7 +287,7 @@ public class NftServiceImpl extends ServiceImpl<NftMapper, Nft> implements NftSe
             throw GlobalException.newException(ResultCode.DATA_ERROR, "没找到此类目");
         }
         int code = RandomUtil.randomInt(1000, 10000);
-        return String.format("JOYING-%s-%s%s", category.getEnglishName(), System.currentTimeMillis(), code);
+        return String.format("INMVO-%s-%s%s", category.getEnglishName(), System.currentTimeMillis(), code);
     }
 
     @Override

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

@@ -35,10 +35,12 @@
         n.is_top,
         n.publish_time,
         u.nickname AS publisherNickname,
-        u.telephone AS publisherAccount
+        u.telephone AS publisherAccount,
+        c.category_name AS category
         FROM
         tb_nft n
         LEFT JOIN tb_user u ON n.user_id = u.id
+        LEFT JOIN tb_category c ON n.category_id = c.id
         WHERE
         is_commemorate=0 and nft_hash != ''
         <if test="name != null and name != ''">