From e9c394d8944d6afc40dc36336e4e93f4de1517c2 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Tue, 27 Jul 2021 16:51:33 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml | 1 +
zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoListVo.java | 11 +++++++++++
zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java | 2 +-
3 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java
index 1edf45f..30c0cfa 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java
@@ -21,7 +21,7 @@
@ApiModelProperty(value = "会员ID")
private Long vipId;
- @NotNull(message = "请选择美疗师")
+// @NotNull(message = "请选择美疗师")
@ApiModelProperty(value = "美疗师ID")
private Long beautyId;
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoListVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoListVo.java
index 04cfadd..1f0baaf 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoListVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoListVo.java
@@ -14,6 +14,9 @@
@ApiModelProperty(value = "会员姓名")
private String vipName;
+ @ApiModelProperty(value = "会员编号")
+ private String vipNo;
+
@ApiModelProperty(value = "会员手机号")
private String phone;
@@ -87,4 +90,12 @@
public void setVipLevel(String vipLevel) {
this.vipLevel = vipLevel;
}
+
+ public String getVipNo() {
+ return vipNo;
+ }
+
+ public void setVipNo(String vipNo) {
+ this.vipNo = vipNo;
+ }
}
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
index 68afb0d..4c304c9 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
@@ -1361,6 +1361,7 @@
select
a.ID id,
a.VIP_NAME vipName,
+ a.VIP_NO vipNo,
a.PHONE phone,
a.photo photo,
b.arriveCnt arriveCnt,
--
Gitblit v1.9.1