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;