ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyPageVo.java
@@ -22,6 +22,9 @@ @ApiModelProperty(value="商户状态0冻结1正常2终止合作") private Integer shopStatus; @ApiModelProperty(value = "商户图片") private String shopPicture; @ApiModelProperty(value = "商户名称") private String shopName; @@ -38,5 +41,6 @@ @JsonFormat(pattern = "yyyy-MM-dd") private Date cooperationEndTime; @ApiModelProperty(value="合作状态0终止1开启") private Integer cooperativeFlag; }