From c897a68da55d63439826d37be3cb13c5c0f95a48 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 25 七月 2025 20:13:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtBirthdayEditDto.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtBirthdayEditDto.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtBirthdayEditDto.java
index b3258af..a8667ae 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtBirthdayEditDto.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtBirthdayEditDto.java
@@ -16,22 +16,22 @@
@Data
public class MgtBirthdayEditDto extends MgtBaseDto {
- @ApiModelProperty(value = "生日卡id 新增不传")
- private Long cardId;
+ @ApiModelProperty(value = "商户id 平台不传")
+ private Long shopId;
@ApiModelProperty(value = "生日卡状态1开启2关闭")
private Integer cardStatus;
- @ApiModelProperty(value = "适用地区标记1全部2指定")
+ @ApiModelProperty(value = "适用地区标记1全部2指定 商户不传")
private Integer areaFlag;
- @ApiModelProperty(value = "适用地区code集合 多个用,隔开")
+ @ApiModelProperty(value = "适用地区code集合 多个用,隔开 商户不传")
private String designatedArea;
- @ApiModelProperty(value = "适用店铺标记1全部2指定")
+ @ApiModelProperty(value = "适用店铺标记1全部2指定 商户不传")
private Integer shopFlag;
- @ApiModelProperty(value = "适用店铺 多个用,隔开")
+ @ApiModelProperty(value = "适用店铺 多个用,隔开 商户不传")
private String applicableShop;
@ApiModelProperty(value = "礼品列表")
--
Gitblit v1.7.1