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

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/vender/WebsitPurchaseCheckVO.java

@@ -20,7 +20,7 @@ public class WebsitPurchaseCheckVO {
 //    @ApiModelProperty(value = "商户名称")
 //    private String companyWechatName;
 
-    @ZfireField(hide = true)
+//    @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")
     private String websitId;