From 8da101629c47cec91d68f785b0f5e829d4a9bab1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 24 一月 2024 15:18:46 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 1.1
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerShopCertificateEditDto.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerShopCertificateEditDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerShopCertificateEditDto.java
index f08060a..99a23de 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerShopCertificateEditDto.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerShopCertificateEditDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.shop.domain.dto;
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,17 +12,17 @@
* @version: 1.0
*/
@Data
-public class MerShopCertificateEditDto {
+public class MerShopCertificateEditDto extends MerBaseDto {
- @ApiModelProperty(name = "证书id 新增不传")
+ @ApiModelProperty(value = "证书id 新增不传")
private Long cerId;
- @ApiModelProperty(name = "证书名字")
+ @ApiModelProperty(value = "证书名字")
private String cerName;
- @ApiModelProperty(name = "证书编号")
+ @ApiModelProperty(value = "证书编号")
private String cerNumber;
- @ApiModelProperty(name = "证书图片")
+ @ApiModelProperty(value = "证书图片")
private String cerPicture;
}
--
Gitblit v1.7.1