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/MgtEditShopDto.java

@@ -54,6 +54,9 @@
    @ApiModelProperty(value="签约区域")
    private String signAreaCode;

    @ApiModelProperty(value="签约区域全称")
    private String signAreaName;

    @ApiModelProperty(value="商户服务电话")
    private String shopServicePhone;