From 89fb503fb82332dfcd90a023f27e87dac912896b Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Tue, 20 Feb 2024 10:19:49 +0800
Subject: [PATCH] =?UTF-8?q?Bug=E4=BF=AE=E5=A4=8D=E3=80=90ID1000418?=
 =?UTF-8?q?=E3=80=91=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86-=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=AF=BC=E5=87=BA=E5=B7=A6=E5=8F=B3=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=8C=89=E7=85=A7=E6=A0=87=E9=A2=98=E7=9A=84?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E6=9D=A5=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/export/WxUserMemberExport.java     | 76 +++++++++----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java
index a529523..6ffc84c 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/export/WxUserMemberExport.java
@@ -7,87 +7,87 @@ import java.util.List;
 
 public class WxUserMemberExport {
 
-    /**
-     * id
-     */
-    @Excel(name = "用户编号")
-    private Long id;
-
     /**
      * 昵称
      */
-    @Excel(name = "会员昵称")
+    @Excel(name = "会员昵称", sort = 1)
     private String nickname;
 
     /**
-     * 积分
+     * id
      */
-    @Excel(name = "积分")
-    private Integer credit;
+    @Excel(name = "用户编号", sort = 2)
+    private Long id;
 
     /**
-     * 即将过期积分
+     * 手机
      */
-    @Excel(name = "即将过期积分")
-    private Integer expireCredit;
+    @Excel(name = "手机号码", sort = 3)
+    private String mobile;
 
     /**
-     * unionid
+     * 生日
      */
-    @Excel(name = "unionid")
-    private String unionid;
+    @Excel(name = "生日", width = 30, dateFormat = "yyyy-MM-dd", sort = 4)
+    private Date birthday;
 
-    /**
-     * 手机
-     */
-    @Excel(name = "手机号")
-    private String mobile;
 
     /**
      * 省
      */
-    @Excel(name = "省")
+    @Excel(name = "省", sort = 5)
     private String province;
 
     /**
      * 市
      */
-    @Excel(name = "市")
+    @Excel(name = "市", sort = 6)
     private String city;
 
     /**
      * 区
      */
-    @Excel(name = "区")
+    @Excel(name = "区", sort = 7)
     private String area;
 
     /**
-     * 生日
+     * 创建时间
      */
-    @Excel(name = "生日", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date birthday;
-
+    @Excel(name = "用户注册时间", dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 8)
+    private Date createTime;
 
     /**
      * 绑定的仪器数量
      */
-    @Excel(name = "仪器数量")
+    @Excel(name = "仪器数量", sort = 9)
     private Integer devicesNum;
 
-    @Excel(name = "仪器名称")
-    private String devicesName;
+    @Excel(name = "小程序标签", sort = 10)
+    String miniProgramTags;
+
+    @Excel(name = "外部标签", sort = 11)
+    String wecomTags;
 
     /**
-     * 创建时间
+     * 积分
      */
-    @Excel(name = "用户注册时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
+    @Excel(name = "积分", sort = 12)
+    private Integer credit;
 
-    @Excel(name = "外部标签")
-    String wecomTags;
+    /**
+     * 即将过期积分
+     */
+    @Excel(name = "即将过期积分", sort = 13)
+    private Integer expireCredit;
 
-    @Excel(name = "小程序标签")
-    String miniProgramTags;
+    /**
+     * unionid
+     */
+    @Excel(name = "unionid", sort = 14)
+    private String unionid;
+
+    @Excel(name = "仪器名称", sort = 15)
+    private String devicesName;
 
 
     public WxUserMemberExport() {