From 65ca63cc3d36f23d285a7d944fcc0d6bac92430d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 14:41:42 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MerEditUserDto.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MerEditUserDto.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MerEditUserDto.java
index da0a7f6..ccf1be0 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MerEditUserDto.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MerEditUserDto.java
@@ -13,9 +13,9 @@
@Data
public class MerEditUserDto extends MerBaseDto{
- @ApiModelProperty(value = "修改类型1.昵称2.头像3.性别4.生日")
+ @ApiModelProperty(value = "修改类型1.昵称2.头像3.性别4.生日5.营业时间")
private Integer editType;
- @ApiModelProperty(value = "修改值 性别0=男,1=女,2=未知 生日YYYY-MM-DD ")
+ @ApiModelProperty(value = "修改值 性别0=男,1=女,2=未知 生日YYYY-MM-DD 营业时间HH:MM-HH:MM")
private String editValue;
}
--
Gitblit v1.7.1