Merge remote-tracking branch 'origin/master'

# Conflicts:
#	roo-admin/roo-admin-server/src/main/java/com/roo/entity/DappsEntity.java

roo-admin/roo-admin-server/src/main/java/com/roo/entity/DappsEntity.java

@@ -3,19 +3,20 @@ package com.roo.entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import com.baomidou.mybatisplus.annotation.*;
-	import java.util.Date;
+
+import java.util.Date;
 
 /**
-* dapp管理
-*
-* @author momin 460363410@qq.com
-* @since 1.0 2021-07-02
-*/
+ * dapp管理
+ *
+ * @author momin 460363410@qq.com
+ * @since 1.0 2021-07-02
+ */
 @Data
-@EqualsAndHashCode(callSuper=false)
+@EqualsAndHashCode(callSuper = false)
 @TableName("roo_wallet.t_dapps")
 public class DappsEntity {
-private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
     @TableId
     private Long id;
@@ -35,6 +36,7 @@ private static final long serialVersionUID = 1L;
      * 访问地址
      */
     private String links;
+    private String discription;
     /**
      * 是否热门（1：热门 0：非热门）
      */
@@ -51,11 +53,6 @@ private static final long serialVersionUID = 1L;
      * 排序（排序，最小靠前）
      */
     private Integer sort;
-
-	/**
-	 * 是否多链 1是 0否
-	 */
-	private Integer multis;
     /**
      * 收录时间
      */