From 546be8a1bafdfc804575a8d07a5d9f2306c29c42 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 19 六月 2025 11:20:58 +0800
Subject: [PATCH] 修改直播列表
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyPageVo.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyPageVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyPageVo.java
index 7eb393c..c1f5a9e 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyPageVo.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyPageVo.java
@@ -1,6 +1,5 @@
package com.ruoyi.shop.domain.vo;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,8 +19,11 @@
@ApiModelProperty(value = "商户id")
private Long shopId;
- @ApiModelProperty("商户状态0冻结1正常2终止合作")
+ @ApiModelProperty(value="商户状态0冻结1正常2终止合作")
private Integer shopStatus;
+
+ @ApiModelProperty(value = "商户图片")
+ private String shopPicture;
@ApiModelProperty(value = "商户名称")
private String shopName;
@@ -29,15 +31,16 @@
@ApiModelProperty(value = "商户地址")
private String shopAddress;
- @ApiModelProperty("店主姓名")
+ @ApiModelProperty(value="店主姓名")
private String shopownerName;
- @ApiModelProperty("店主联系方式")
+ @ApiModelProperty(value="店主联系方式")
private String shopownerPhone;
- @ApiModelProperty("合作期限")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value="合作期限")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date cooperationEndTime;
-
+ @ApiModelProperty(value="合作状态0终止1开启")
+ private Integer cooperativeFlag;
}
--
Gitblit v1.7.1