Merge remote-tracking branch 'origin/feature-20240104' into feature-20240104

flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserMember.java

@@ -54,13 +54,13 @@ public class WxUserMember extends BaseEntity {
     /**
      * $column.columnComment
      */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @Excel(name = "unionid")
     private String unionid;
 
     /**
-     * 用户类型：1游客 2会员
+     * 用户类型：0游客 1会员
      */
-    @Excel(name = "用户类型：1游客 2会员")
+    @Excel(name = "用户类型：0游客 1会员")
     private Integer userType;
 
     /**

flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml

@@ -200,7 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="upgradeMember">
         UPDATE `wx_user_member`
-        SET `user_type` = 2,
+        SET `user_type` = 1,
             `level` = 1,
             `mobile` = #{phoneNumber},
             `login_time` = sysdate(),