From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/java/com/matrix/system/app/dto/AddVipDto.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/AddVipDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/AddVipDto.java
index 901729b..5c090c5 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/AddVipDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/AddVipDto.java
@@ -4,6 +4,7 @@
import com.matrix.core.tools.DateUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@@ -16,8 +17,9 @@
**/
@ApiModel(value = "AddVipDto", description = "添加会员接收参数类")
public class AddVipDto {
+ @ApiModelProperty(value = "头像")
+ private String photo;
- @NotBlank(message = "会员编号不能为空")
@ApiModelProperty(value = "会员编号")
private String vipNo;
@@ -37,6 +39,9 @@
@ApiModelProperty(value = "生日")
@JsonFormat(pattern = DateUtil.DATE_FORMAT_DD, timezone = "GMT+8")
private Date birthday;
+
+ @ApiModelProperty(value = "资金密码", example = "123456")
+ private String password;
@ApiModelProperty(value = "省市区", example = "湖南省,长沙市,岳麓区")
private String areas;
@@ -143,4 +148,20 @@
public void setLabels(List<String> labels) {
this.labels = labels;
}
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public String getPhoto() {
+ return photo;
+ }
+
+ public void setPhoto(String photo) {
+ this.photo = photo;
+ }
}
--
Gitblit v1.9.1