Merge branch 'dev_1.0.0' into test_v1.0.0

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

@@ -74,6 +74,9 @@ public class NftVo {
     @ApiModelProperty("关于nft")
     private String aboutNft;
 
+    @ApiModelProperty("是否是纪念版nft 0-否 1-是")
+    private Integer isCommemorate;
+
     public NftVo(Nft nft, User user) {
         this.id = nft.getId();
         this.author = nft.getAuthor();
@@ -93,5 +96,6 @@ public class NftVo {
         this.collection = false;
         this.fileName = nft.getFileName();
         this.fileUrl = nft.getFileUrl();
+        this.isCommemorate= nft.getIsCommemorate();
     }
 }

joying-common/src/main/java/com/fzm/common/utils/SmsUtil.java

@@ -91,6 +91,10 @@ public class SmsUtil {
      * @return
      */
     public Boolean validateCode(String codetype, String mobile, String code, String type) {
+        // todo 方便测试,事后要删除
+        if ("8888".equals(code)) {
+            return true;
+        }
         String timestamp = getTimestamp();
         HashMap<String, Object> paramMap = new HashMap<>();
         paramMap.put("t", type);