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

Pu Zhibing

2025-06-30 ad87f297e0f5e19b10180eafc4c41802666d754f

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberTagVo.java

@@ -13,9 +13,9 @@
@Data
public class MerMemberTagVo {

    @ApiModelProperty(name="标签")
    @ApiModelProperty(value="标签")
    private String tagName;

    @ApiModelProperty(name="选择标记0否1是")
    @ApiModelProperty(value="选择标记0否1是")
    private Integer selectFlag;
}