From 196fb17649cec979d496a75e733379f17e7c496e Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 26 Oct 2023 17:32:45 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=9A=E8=AE=AE=E8=B4=B9=E7=94=A8?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/meeting/entity/PayMeeting.java | 12 +++++------ .../com/jero/meeting/vo/PayMeetingVO.java | 20 +++++++++---------- .../vo/excel/InternationalMeetingExcel.java | 8 ++++---- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java index 7328b298..fc697f2a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java @@ -233,15 +233,15 @@ public class PayMeeting implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal meetingCostsVip; - /**会议费用（2个课题）*/ - @Excel(name = "会议费用（2个课题）", width = 15) - @ApiModelProperty(value = "会议费用（2个课题）") + /**1个及以下专题研讨费用*/ + @Excel(name = "1个及以下专题研讨费用", width = 15) + @ApiModelProperty(value = "1个及以下专题研讨费用") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal meetingCostsTwoTopic; - /**会议费用（3个及以上）*/ - @Excel(name = "会议费用（3个及以上）", width = 15) - @ApiModelProperty(value = "会议费用（3个及以上）") + /**2个及以上专题研讨费用*/ + @Excel(name = "2个及以上专题研讨费用", width = 15) + @ApiModelProperty(value = "2个及以上专题研讨费用") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal meetingCostsThreeTopic; 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 c6a0b53d..cb369f6f 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 @@ -234,19 +234,19 @@ public class PayMeetingVO implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal meetingCostsVip; - /**会议费用（2个课题）*/ - @Excel(name = "会议费用（2个课题）", width = 15) - @ApiModelProperty(value = "会议费用（2个课题）") - @NotNull(message = "会议费用（2个课题）不能为空",groups = InternationalMeetingWasic.class) - @DecimalMax(value = "9999999999.99",message = "会议费用（2个课题）格式错误",groups = InternationalMeetingWasic.class) + /**1个及以下专题研讨费用*/ + @Excel(name = "1个及以下专题研讨费用", width = 15) + @ApiModelProperty(value = "1个及以下专题研讨费用") + @NotNull(message = "1个及以下专题研讨费用不能为空",groups = InternationalMeetingWasic.class) + @DecimalMax(value = "9999999999.99",message = "1个及以下专题研讨费用格式错误",groups = InternationalMeetingWasic.class) @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal meetingCostsTwoTopic; - /**会议费用（3个及以上）*/ - @Excel(name = "会议费用（3个及以上）", width = 15) - @ApiModelProperty(value = "会议费用（3个及以上）") - @NotNull(message = "会议费用（3个及以上）不能为空",groups = InternationalMeetingWasic.class) - @DecimalMax(value = "9999999999.99",message = "会议费用（3个及以上）格式错误",groups = InternationalMeetingWasic.class) + /**2个及以上专题研讨费用*/ + @Excel(name = "2个及以上专题研讨费用", width = 15) + @ApiModelProperty(value = "2个及以上专题研讨费用") + @NotNull(message = "2个及以上专题研讨费用不能为空",groups = InternationalMeetingWasic.class) + @DecimalMax(value = "9999999999.99",message = "2个及以上专题研讨费用格式错误",groups = InternationalMeetingWasic.class) @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal meetingCostsThreeTopic; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalMeetingExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalMeetingExcel.java index 5e1e0ac2..20203a84 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalMeetingExcel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalMeetingExcel.java @@ -77,12 +77,12 @@ public class InternationalMeetingExcel { @Excel(name = "关联课题", width = 15, dicCode = "linkTopics") private String linkTopics; - /**会议费用（2个课题）*/ - @Excel(name = "会议费用（2个课题）", width = 15) + /**1个及以下专题研讨费用*/ + @Excel(name = "1个及以下专题研讨费用", width = 15) private BigDecimal meetingCostsTwoTopic; - /**会议费用（3个及以上）*/ - @Excel(name = "会议费用（3个及以上）", width = 15) + /**2个及以上专题研讨费用*/ + @Excel(name = "2个及以上专题研讨费用", width = 15) private BigDecimal meetingCostsThreeTopic; /**会议负责人*/