Merge remote-tracking branch 'origin/test' into test

src/main/java/com/sqx/modules/app/entity/UserInfo.java

@@ -1,6 +1,8 @@
 package com.sqx.modules.app.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -17,12 +19,14 @@ public class UserInfo implements Serializable {
      *
      */
     @TableId(type = IdType.ID_WORKER)
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
      * 用户id
      */
     @TableField(updateStrategy = FieldStrategy.NEVER)
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
 
     /**