Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

 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;

}