Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

 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;