From 1516545b6915764287c4318ad8a7415043e43cbe Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 3 Sep 2021 14:29:42 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=96=B0=E5=A2=9E=E4=BC=9A=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/meeting/common/MeetingCommon.java | 6 +++--- .../src/main/java/com/jero/meeting/vo/PayMeetingVO.java | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java index 77480650..820f4db5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java @@ -9,15 +9,15 @@ public class MeetingCommon { /** * 工作组会议 */ - public final static String WORKING_GROUP_MEETING = "1"; + public final static String WORKING_GROUP_MEETING = "工作组会议"; /** * 标协会议 */ - public final static String STANDARD_MEETING = "2"; + public final static String STANDARD_MEETING = "标协会议"; /** * 国际研讨会 */ - public final static String INTERNATIONAL_MEETING = "3"; + public final static String INTERNATIONAL_MEETING = "国际研讨会"; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java index f6c709a6..10624a64 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java @@ -175,8 +175,8 @@ public class PayMeetingVO implements Serializable { /**会议费用（标协会员）*/ @Excel(name = "会议费用（标协会员）", width = 15) @ApiModelProperty(value = "会议费用（标协会员）") - @NotNull(message = "会议费用（标协会员）不能为空") - @Max(value = 999999999,message = "会议费用（标协会员）格式错误") + @NotNull(message = "会议费用（标协会员）不能为空",groups = StandardMeeting.class) + @Max(value = 999999999,message = "会议费用（标协会员）格式错误",groups = StandardMeeting.class) private Integer meetingCostsVip; /**会议负责人id*/ @@ -212,7 +212,6 @@ public class PayMeetingVO implements Serializable { * 会议关联酒店联系人列表 */ @Valid - @NotNull(message = "酒店联系人不能为空",groups = StandardMeeting.class) @Size(max = 5, message = "酒店联系人最多为5个",groups = StandardMeeting.class) private ValidList payMeetingHotelContactsList;