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/vo/MgtMemberPageVo.java

@@ -79,6 +79,12 @@
    @Excel(name = "客户类型", width = 30, sort = 13)
    private String goodsType;

    @ApiModelProperty(value = "关联商户id")
    @Excel(name = "关联商户名称", width = 30, sort = 14)
    private Long relationShopId;

    private Integer bindingFlag;

    @ApiModelProperty(value = "关联商户名称")
    @Excel(name = "关联商户名称", width = 30, sort = 14)
    private String relationShopName;