Merge remote-tracking branch 'origin/master'

puzhibing

2024-03-18 945561a655919045c3086f00d7d16dbc1d24c23f

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtBirthdayGetDto.java

@@ -14,7 +14,7 @@
@Data
public class MgtBirthdayGetDto extends MgtBaseDto {

    @ApiModelProperty(value = "商户id")
    @ApiModelProperty(value = "商户id 平台不传")
    private Long shopId;

}