Merge remote-tracking branch 'origin/master' into matser

fs-service/src/main/java/com/fs/xiaoshouyi/domain/XsyAccount.java

@@ -1,5 +1,7 @@
 package com.fs.xiaoshouyi.domain;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.util.Date;
@@ -14,6 +16,7 @@ public class XsyAccount {
     /**
      * 主键ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**