合并代码

puzhibing

2024-03-18 65ca63cc3d36f23d285a7d944fcc0d6bac92430d

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopListSimpleVo.java

@@ -16,7 +16,10 @@
    @ApiModelProperty(value = "商户id")
    private Long shopId;

    @ApiModelProperty("商户名称")
    @ApiModelProperty(value="商户名称")
    private String shopName;

    @ApiModelProperty(value="店长")
    private String shopUser;

}