Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-08-03 cc1181b93c51c60a117846f9640d3f56370e67f3

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

@@ -29,11 +29,11 @@
    private String shopType;

    @Excel(name = "店主姓名", width = 30)
    @ApiModelProperty("店主姓名")
    @ApiModelProperty(value="店主姓名")
    private String shopownerName;

    @Excel(name = "店主联系方式", width = 30)
    @ApiModelProperty("店主联系方式")
    @ApiModelProperty(value="店主联系方式")
    private String shopownerPhone;

    @Excel(name = "建议内容", width = 30)