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

mall-server-api/src/main/java/com/gree/mall/manager/bean/admin/AdminCompanyPayConfigVO.java

@@ -18,8 +18,8 @@ public class AdminCompanyPayConfigVO {
     @ApiModelProperty(value = "企业的微信配置id")
     private String companyWechatId;
 
-//    @ApiModelProperty(value = "所属商户")
-//    private String companyName;
+    @ApiModelProperty(value = "商户属性")
+    private String attr;
 
     @ApiModelProperty(value = "电子商户名称")
     private String payMerchantName;