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/dto/MgtShopPageDto.java

@@ -89,6 +89,7 @@
    @ApiModelProperty(value = "与合作商关系1.好2.差")
    private Integer relationPartner;


    @ApiModelProperty(value = "商铺id")
    private Integer shopId;

}