Merge branch 'feature_member_score_zby' into feature_member_score

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/memberUserScoreLog/MemberUserScoreLogBackVO.java

@@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.member.vo.memberUserScoreLog;
 
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,6 +20,7 @@ import java.util.Map;
 @ApiModel("管理后台 - 积分记录查询 VO")
 public class MemberUserScoreLogBackVO {
     @ApiModelProperty(value = "积分记录id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
     @ApiModelProperty(value = "会员id")
     private Long memberId;

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardRedeemBaseVO.java

 package cn.iocoder.yudao.module.reward.vo.reward;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -8,6 +10,7 @@ import java.util.Date;
 @Data
 public class RewardRedeemBaseVO {
     @ApiModelProperty(value = "id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
     /**
      * 会员id

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardRedeemPageRespVO.java

@@ -35,5 +35,4 @@ public class RewardRedeemPageRespVO extends RewardRedeemBaseVO {
     private String currencyTitleEn;
     @ApiModelProperty(value = "快递公司名称")
     private String courierCompanyName;
-
 }