添加商户标签、用户收入字段

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java

@@ -130,4 +130,9 @@ public class Customer extends BaseEntity
     private Integer zhiMa;
 
 
+    /** 月收入 */
+    @Excel(name = "月收入")
+    private Integer income;
+
+
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java

@@ -82,6 +82,10 @@ public class Merchant extends BaseEntity
     @Excel(name = "手机号禁入号段英文逗号分隔")
     private String phoneLimit;
 
+    /** 标签 */
+    @Excel(name = "标签")
+    private String label;
+
     /** 无社保 */
     @Excel(name = "无社保")
     private Boolean socialSecurityNo;