From 4c86432944d3e7ed98392e0f3bbd3d0f09f831ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Fri, 6 Sep 2024 15:22:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E4=BD=BF=E7=94=A8=E5=9B=BD=E5=AE=B6/=E5=9C=B0?= =?UTF-8?q?=E5=8C=BA=E6=94=B9=E4=B8=BA=E9=80=82=E7=94=A8=E5=B8=82=E5=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../marketStandard/entity/LawsMarketStandardDetail.java | 8 ++++---- .../entity/LawsMarketStandardDetailExcel.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java index 6b0f0d71..f0ee564d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java @@ -120,11 +120,11 @@ public class LawsMarketStandardDetail implements Serializable { private String registrationDate; /** - * 国家 + * 适用市场 */ - @Excel(name = "适用国家/地区", width = 15,dicCode = "market_state", mergeVertical = true, mergeRely = {0}) - @NotBlank(message = "适用国家/地区不能为空") - @ApiModelProperty(value = "国家") + @Excel(name = "适用市场", width = 15,dicCode = "market_state", mergeVertical = true, mergeRely = {0}) + @NotBlank(message = "适用适用市场不能为空") + @ApiModelProperty(value = "适用市场") @Dict(dicCode = "market_state") private String country; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java index d4481c1b..7f24e98b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java @@ -121,11 +121,11 @@ public class LawsMarketStandardDetailExcel implements Serializable { private String registrationDate; /** - * 国家 + * 适用市场 */ - @Excel(name = "*适用国家/地区", width = 15,dicCode = "market_state") - @NotBlank(message = "适用国家/地区不能为空") - @ApiModelProperty(value = "国家") + @Excel(name = "*适用市场", width = 15,dicCode = "market_state") + @NotBlank(message = "适用市场不能为空") + @ApiModelProperty(value = "适用市场") @Dict(dicCode = "market_state") private String country;