From 545d3a5024f54976a6685a30c7c1a4107fd5d563 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 19 Dec 2024 17:50:05 +0800
Subject: [PATCH] fix(mall): 修复会员兑换碳币权限及数据展示问题- 修改会员兑换碳币权限判断逻辑，使用 withdrawState 替代 changeState - 调整 ApiRunDataVo 中 score 和 realScore 字段含义，确保数据展示正确 - 更新 buyVipList.html 中状态颜色，以更直观地显示不同状态
---
src/main/java/cc/mrbird/febs/mall/dto/RegisterDto.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/RegisterDto.java b/src/main/java/cc/mrbird/febs/mall/dto/RegisterDto.java
index 69a49f7..0662267 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/RegisterDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/RegisterDto.java
@@ -18,19 +18,26 @@
@ApiModelProperty(value = "手机号", example = "15773001234")
private String account;
- @NotBlank(message = "密码不能为空")
- @ApiModelProperty(value = "密码", example = "123456")
- private String password;
-
@ApiModelProperty(value = "类型 1-手机号 2-邮箱", example = "1")
- private Integer type = 1;
+ private String type = "1";
@NotBlank(message = "验证码不能为空")
@ApiModelProperty(value = "验证码", example = "123456")
private String code;
- @NotBlank(message = "邀请码不能为空")
+ @NotBlank(message = "密码不能为空")
+ @ApiModelProperty(value = "密码", example = "123456")
+ private String password;
+
+ @NotBlank(message = "密码不能为空")
+ @ApiModelProperty(value = "重复密码", example = "123456")
+ private String passwordAgain;
+
+ // @NotBlank(message = "邀请码不能为空")
@ApiModelProperty(value = "邀请码")
private String inviteId;
+ @ApiModelProperty(hidden = true)
+ private String registType;
+
}
--
Gitblit v1.9.1