Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

2025-07-25 c897a68da55d63439826d37be3cb13c5c0f95a48

 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;

}