QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

市场法规清单使用国家/地区改为适用市场

Browse Source
This commit is contained in:
梁琦涛
2024-09-06 15:22:34 +08:00
parent 0e9013e5f2
commit 4c86432944
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java
+4 -4
View File
@@ -120,11 +120,11 @@ public class LawsMarketStandardDetail implements Serializable {
private String registrationDate; private String registrationDate;
/** /**
* 国家 * 适用市场
*/ */
@Excel(name = "适用国家/地区", width = 15,dicCode = "market_state", mergeVertical = true, mergeRely = {0}) @Excel(name = "适用市场", width = 15,dicCode = "market_state", mergeVertical = true, mergeRely = {0})
@NotBlank(message = "适用国家/地区不能为空") @NotBlank(message = "适用适用市场不能为空")
@ApiModelProperty(value = "国家") @ApiModelProperty(value = "适用市场")
@Dict(dicCode = "market_state") @Dict(dicCode = "market_state")
private String country; private String country;
laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetailExcel.java
+4 -4
View File
@@ -121,11 +121,11 @@ public class LawsMarketStandardDetailExcel implements Serializable {
private String registrationDate; private String registrationDate;
/** /**
* 国家 * 适用市场
*/ */
@Excel(name = "*适用国家/地区", width = 15,dicCode = "market_state") @Excel(name = "*适用市场", width = 15,dicCode = "market_state")
@NotBlank(message = "适用国家/地区不能为空") @NotBlank(message = "适用市场不能为空")
@ApiModelProperty(value = "国家") @ApiModelProperty(value = "适用市场")
@Dict(dicCode = "market_state") @Dict(dicCode = "market_state")
private String country; private String country;