Merge remote-tracking branch 'origin/2.0' into 2.0

Pu Zhibing

3 天以前 49c5117caef44d1e817d2ef701529dfaf1443467

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MgtSimpleShopVo.java

@@ -18,4 +18,7 @@

    @ApiModelProperty(value = "商户名称")
    private String shopName;

    @ApiModelProperty(value = "客服电话")
    private String shopServicePhone;
}