Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

44323

2024-01-24 61b5f9863f14ab4fc9da504ca2b553a778eb2e2c

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

@@ -83,6 +83,8 @@
    @Excel(name = "关联商户名称", width = 30, sort = 14)
    private Long relationShopId;

    private Integer bindingFlag;

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