Merge remote-tracking branch 'origin/master'

This commit is contained in:
yjz
2024-07-05 16:52:46 +08:00
@@ -97,25 +97,20 @@ public class LawsMarketStandardDetail implements Serializable {
/**
* 新生产车实施日期
*/
@Excel(name = "新生产车实施日期", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@Excel(name = "新生产车实施日期", width = 15)
@ApiModelProperty(value = "新生产车实施日期")
private Date newProductImplDate;
private String newProductImplDate;
/**
* 新认证车实施日期
*/
@Excel(name = "新认证车实施日期", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@Excel(name = "新认证车实施日期", width = 15)
@ApiModelProperty(value = "新认证车实施日期")
private Date newAuthImplDate;
private String newAuthImplDate;
/**
* 注册日期
*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@Excel(name = "注册日期", width = 15)
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "注册日期")