Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

 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;

}