Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ShopRelUserVo.java

@@ -6,9 +6,9 @@
@Data
public class ShopRelUserVo {

    @ApiModelProperty("商户id")
    @ApiModelProperty(value="商户id")
    private Long shopId;

    @ApiModelProperty("用户姓名")
    @ApiModelProperty(value="用户姓名")
    private String userName;
}