Merge remote-tracking branch 'origin/main'

scrm-module/scrm-business/src/main/java/org/scrm/domain/customer/vo/WeCustomersVo.java

@@ -76,14 +76,14 @@ public class WeCustomersVo {
      *
      * @see CustomerAddWay
      */
-    @ExcelProperty(value = "添加方式", index = 10, converter = CustomerAddWayConverter.class)
+    @ExcelProperty(value = "添加方式", index = 9, converter = CustomerAddWayConverter.class)
     private Integer addMethod;
 
     /**
      * 添加时间
      */
     @DateTimeFormat("yyyy-MM-dd")
-    @ExcelProperty(value = "添加时间", index = 11)
+    @ExcelProperty(value = "添加时间", index = 10)
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date firstAddTime;
 
@@ -111,25 +111,25 @@ public class WeCustomersVo {
     /**
      * 手机号
      */
-    @ExcelProperty(value = "手机号", index = 13)
+    @ExcelProperty(value = "手机号", index = 12)
     private String phone;
 
     /**
      * 邮箱
      */
-    @ExcelProperty(value = "邮箱", index = 14)
+    @ExcelProperty(value = "邮箱", index = 13)
     private String email;
 
     /**
      * 地址
      */
-    @ExcelProperty(value = "详细地址", index = 17)
+    @ExcelProperty(value = "详细地址", index = 16)
     private String address;
 
     /**
      * qq
      */
-    @ExcelProperty(value = "QQ", index = 15)
+    @ExcelProperty(value = "QQ", index = 14)
     private String qq;
 
     /**
@@ -170,7 +170,7 @@ public class WeCustomersVo {
     /**
      * 标签名称，使用逗号隔开(企业标签名)
      */
-    @ExcelProperty(value = "企业标签", index = 12)
+    @ExcelProperty(value = "企业标签", index = 11)
     private String tagNames;
 
     /**
@@ -196,14 +196,14 @@ public class WeCustomersVo {
     /**
      * 地区
      */
-    @ExcelProperty(value = "所在省市县", index = 16)
+    @ExcelProperty(value = "所在省市县", index = 15)
     private String area;
 
 
     /**
      * 0:加入黑名单;1:不加入黑名单;
      */
-    @ExcelProperty(value = "是否加入黑名单", index = 18, converter = BlackListConverter.class)
+    @ExcelProperty(value = "是否加入黑名单", index = 17, converter = BlackListConverter.class)
     private Integer isJoinBlacklist;