From 6424048caa1ceb3fe5ad31a68fb6eec69bbed6d2 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 04 九月 2024 11:19:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/dto/response/point/CustomerPointDetailDTO.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/point/CustomerPointDetailDTO.java b/src/main/java/com/mzl/flower/dto/response/point/CustomerPointDetailDTO.java
index 84c5568..1ab3855 100644
--- a/src/main/java/com/mzl/flower/dto/response/point/CustomerPointDetailDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/point/CustomerPointDetailDTO.java
@@ -1,6 +1,7 @@
package com.mzl.flower.dto.response.point;
import com.mzl.flower.base.AbstractTransDTO;
+import com.mzl.flower.base.annotation.DictTrans;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,20 +19,22 @@
@ApiModelProperty("商户ID")
private Long customerId;
- @ApiModelProperty("积分变更类型-point_change_type")
+ @ApiModelProperty("积分变更类型-POINT_CHANGE_TYPE")
+ @DictTrans(target = "changeTypeStr",codeType = "POINT_CHANGE_TYPE")
private String changeType;
- @ApiModelProperty("积分类型-point_type")
+ @ApiModelProperty("积分类型-POINT_TYPE")
+ @DictTrans(target = "typeStr",codeType = "POINT_TYPE")
private String type;
+
+ @ApiModelProperty("积分变更类型-point_change_type")
+ private String changeTypeStr;
+
+ @ApiModelProperty("积分类型-POINT_TYPE")
+ private String typeStr;
@ApiModelProperty("积分")
private String point;
-
- @ApiModelProperty("使用积分")
- private String usePoint;
-
- @ApiModelProperty("过期积分")
- private String expiredPoint;
@ApiModelProperty("积分备注")
private String remarks;
--
Gitblit v1.9.3