市场法规清单使用国家/地区改为适用市场
This commit is contained in:
+4
-4
@@ -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;
|
||||
|
||||
|
||||
+4
-4
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user