列表注释商户名称

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

@@ -1,10 +1,7 @@
 package com.gree.mall.manager.bean;
 
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.plus.entity.CommonTemplate;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -39,8 +36,8 @@ public class CommonTemplateVO   {
     @ApiModelProperty(value = "企业微信id")
     private String companyWechatId;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyName;
 
     @ZfireField(tbName = "a",hide = true)
     @ApiModelProperty(value = "水印logo")

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

@@ -36,7 +36,7 @@ public class FreightTemplateVO {
     @ApiModelProperty(value = "企业微信id")
     private String companyWechatId;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyName;
 
 }

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

@@ -54,8 +54,8 @@ public class StorageVO   {
     @ApiModelProperty(value = "企业微信id")
     private String companyWechatId;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyName;
 
     @ApiModelProperty(value = "是否默认仓")
     private IsEnum isDefault;

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/PromotionActivityVO.java

@@ -13,12 +13,12 @@ import java.util.Date;
 @ZfireField(tbName = "a")
 public class PromotionActivityVO {
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "所属商户")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "所属商户")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "所属网点")
     private String customWebsitName;

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 companyName;
 
     @ApiModelProperty(value = "电子商户名称")
     private String payMerchantName;

mall-server-api/src/main/java/com/gree/mall/manager/bean/carouselMap/CarouselMapVO.java

@@ -18,8 +18,8 @@ public class CarouselMapVO   {
     @ApiModelProperty(value = "轮翻id")
     private String id;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyName;
 
     @ApiModelProperty(value = "轮播图名称")
     private String carouselName;

mall-server-api/src/main/java/com/gree/mall/manager/bean/common/SysDictCompanyVO.java

@@ -35,8 +35,8 @@ public class SysDictCompanyVO {
     @ApiModelProperty("排序")
     private Integer sortNum;
 
-    @ApiModelProperty("所属商户")
-    private String  companyName;
+//    @ApiModelProperty("所属商户")
+//    private String  companyName;
 
     @ZfireField(hide = true)
     @ApiModelProperty("所属商户id")

mall-server-api/src/main/java/com/gree/mall/manager/bean/common/SysDictVO.java

@@ -42,8 +42,8 @@ public class SysDictVO {
     @ApiModelProperty("排序")
     private Integer sortNum;
 
-    @ApiModelProperty("所属商户")
-    private String  companyName;
+//    @ApiModelProperty("所属商户")
+//    private String  companyName;
 
     @ZfireField(hide = true)
     @ApiModelProperty("所属商户id")

mall-server-api/src/main/java/com/gree/mall/manager/bean/coupon/CouponPageBeanVO.java

@@ -1,11 +1,7 @@
 package com.gree.mall.manager.bean.coupon;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.CouponPageFlagEnum;
 import com.gree.mall.manager.enums.CouponPageTypeEnum;
-import com.gree.mall.manager.plus.entity.Coupon;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -114,8 +110,8 @@ public class CouponPageBeanVO   {
     @ApiModelProperty(value = "企业微信id")
     private String companyWechatId;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyName;
 
 
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/EnginPayManageGatherVO.java

@@ -18,8 +18,8 @@ public class EnginPayManageGatherVO {
     @ApiModelProperty(value = "商户编号")
     private String companyWechatId;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "工程编号")
     private String projectNo;

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/EnginPayManageImport.java

@@ -16,8 +16,8 @@ public class EnginPayManageImport {
     @ApiModelProperty(value = "商户编号")
     private String companyWechatId;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "网点编号")
     private String websitId;

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/EnginPayManageVO.java

@@ -23,8 +23,8 @@ public class EnginPayManageVO {
     @ApiModelProperty(value = "商户编号")
     private String companyWechatId;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/RpMaterialOrderAllListVO.java

@@ -28,8 +28,8 @@ public class RpMaterialOrderAllListVO    {
     @ApiModelProperty(value = "商户编号")
     private String companyWechatId;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
 
     @ApiModelProperty(value = "网点编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/RpMaterialOrderLineVO.java

@@ -22,8 +22,8 @@ public class RpMaterialOrderLineVO {
     @ApiModelProperty(value = "商户编号")
     private String companyWechatId;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
 
     @ApiModelProperty(value = "网点编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/RpMaterialOrderVO.java

@@ -1,15 +1,12 @@
 package com.gree.mall.manager.bean.engin;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.*;
+import com.gree.mall.manager.enums.IsYesNoEnum;
+import com.gree.mall.manager.enums.MaterialExamineStatusEnum;
+import com.gree.mall.manager.enums.SettlementPayTypeEnum;
+import com.gree.mall.manager.enums.SettlementStatusEnum;
 import com.gree.mall.manager.enums.engin.FeePayMethodEnum;
-import com.gree.mall.manager.enums.material.PayTypeEnum;
 import com.gree.mall.manager.enums.material.WebsitGoodsTypeEnum;
-import com.gree.mall.manager.plus.entity.RpMaterialOrder;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,12 +21,12 @@ public class RpMaterialOrderVO    {
     @ApiModelProperty(value = "申请单号")
     private String orderId;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
 
     @ApiModelProperty(value = "网点编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/RpMaterialOrderWechatVO.java

@@ -1,15 +1,9 @@
 package com.gree.mall.manager.bean.engin;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
 import com.gree.mall.manager.enums.*;
 import com.gree.mall.manager.enums.engin.FeePayMethodEnum;
-import com.gree.mall.manager.enums.material.PayTypeEnum;
 import com.gree.mall.manager.enums.material.WebsitGoodsTypeEnum;
-import com.gree.mall.manager.plus.entity.RpMaterialOrder;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,12 +18,12 @@ public class RpMaterialOrderWechatVO    {
     @ApiModelProperty(value = "申请单号")
     private String orderId;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
 
     @ApiModelProperty(value = "网点编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/WebsitSalesManagerVO.java

@@ -6,11 +6,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.ExamineStatusEnum;
 import com.gree.mall.manager.enums.ExamineStatusManagerEnum;
 import com.gree.mall.manager.enums.material.WebsitGoodsTypeEnum;
-import com.gree.mall.manager.plus.entity.OrderEnginBase;
-import com.gree.mall.manager.plus.entity.WebsitSalesManager;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -28,12 +25,12 @@ public class WebsitSalesManagerVO     {
     @TableId(value = "websit_sales_manager_id", type = IdType.ID_WORKER_STR)
     private String websitSalesManagerId;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "工程机编号")
     private String orderEnginBaseId;

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/WorkerMaterialSettlementVO.java

@@ -3,18 +3,12 @@ package com.gree.mall.manager.bean.engin;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.IsYesNoEnum;
-import com.gree.mall.manager.enums.MaterialExamineStatusEnum;
-import com.gree.mall.manager.enums.PayStatusEnum;
 import com.gree.mall.manager.enums.SettlementPayTypeEnum;
-import com.gree.mall.manager.enums.engin.FeePayMethodEnum;
-import com.gree.mall.manager.enums.material.WebsitGoodsTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 @Data
 @ApiModel
@@ -23,12 +17,12 @@ public class WorkerMaterialSettlementVO {
     @ZfireField(hide = true)
     @TableId(value = "id", type = IdType.ID_WORKER_STR)
     private String id;
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "网点编号")
     private String websitId;

mall-server-api/src/main/java/com/gree/mall/manager/bean/es/ESGoodsVO.java

@@ -19,12 +19,12 @@ public class ESGoodsVO {
     @ApiModelProperty(value = "id")
     private String id;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "所属商户")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "所属商户")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "用户id")

mall-server-api/src/main/java/com/gree/mall/manager/bean/goods/CustomSecSpecBeanVO.java

@@ -1,13 +1,7 @@
 package com.gree.mall.manager.bean.goods;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.bean.activity.CustomSecSpecBean;
-import com.gree.mall.manager.bean.activity.CustomSpecBean;
-import com.gree.mall.manager.enums.CustomSecStatusEnum;
 import com.gree.mall.manager.enums.StatusEnum;
-import com.gree.mall.manager.plus.entity.SecKillActivitySpec;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -85,8 +79,8 @@ public class CustomSecSpecBeanVO     {
     @ApiModelProperty(value = "企业微信id")
     private String companyWechatId;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyName;
 
 
 }

mall-server-api/src/main/java/com/gree/mall/manager/bean/goods/GoodsCodeAccVO.java

@@ -7,7 +7,6 @@ import com.gree.mall.manager.enums.CodeAccStatusEnum;
 import com.gree.mall.manager.enums.CodeAccTypeEnum;
 import com.gree.mall.manager.enums.material.GoodsMaterialTypeEnum;
 import com.gree.mall.manager.enums.material.UnitEnum;
-import com.gree.mall.manager.plus.entity.GoodsCodeAcc;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,12 +20,12 @@ public class GoodsCodeAccVO   {
     @ZfireField(hide = true)
     private String goodsCodeAccId;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
     @ZfireField(hide = true)
     @ApiModelProperty(value = "品牌id")
     private String brandId;

mall-server-api/src/main/java/com/gree/mall/manager/bean/goods/GoodsMaterialVO.java

@@ -19,12 +19,12 @@ public class GoodsMaterialVO {
     @ApiModelProperty(value = "商品物料id")
     private String id;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "是否虚拟商品")

mall-server-api/src/main/java/com/gree/mall/manager/bean/goods/GoodsNewsCategoryVO.java

@@ -1,10 +1,7 @@
 package com.gree.mall.manager.bean.goods;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
 import com.gree.mall.manager.enums.StatusEnum;
-import com.gree.mall.manager.plus.entity.GoodsNewsCategory;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -37,13 +34,13 @@ public class GoodsNewsCategoryVO   {
     @ApiModelProperty(value = "创建人")
     private String createBy;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "企业微信id")
-    private String companyWechatId;
-
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "企业微信id")
+//    private String companyWechatId;
+//
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyName;
 
     @ApiModelProperty(value = "排序整数")
     private Integer sortNum;

mall-server-api/src/main/java/com/gree/mall/manager/bean/goods/GoodsPurchaseCodeVO.java

@@ -22,12 +22,12 @@ public class GoodsPurchaseCodeVO {
     @ApiModelProperty(value = "单据商品条码id")
     private String id;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "供应商编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/goods/GoodsPurchaseItemVO.java

@@ -21,12 +21,12 @@ public class GoodsPurchaseItemVO {
     @ApiModelProperty(value = "单据状态")
     private ExamineStatusEnum status;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "供应商编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/goods/GoodsPurchaseRetCodeVO.java

@@ -25,12 +25,12 @@ public class GoodsPurchaseRetCodeVO {
     @ApiModelProperty(value = "采购入库单号")
     private String goodsPurchaseId;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "供应商编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/goods/GoodsPurchaseRetItemVO.java

@@ -24,12 +24,12 @@ public class GoodsPurchaseRetItemVO {
     @ApiModelProperty(value = "单据状态")
     private ExamineStatusEnum status;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "供应商编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/goods/GoodsPurchaseRetVO.java

@@ -24,12 +24,12 @@ public class GoodsPurchaseRetVO {
     @ApiModelProperty(value = "单据状态")
     private ExamineStatusEnum status;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "供应商编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/goods/GoodsPurchaseVO.java

@@ -3,7 +3,6 @@ package com.gree.mall.manager.bean.goods;
 import com.gree.mall.manager.annotation.ZfireField;
 import com.gree.mall.manager.enums.ExamineStatusEnum;
 import com.gree.mall.manager.enums.IsEnum;
-import com.gree.mall.manager.plus.entity.GoodsPurchase;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -22,12 +21,12 @@ public class GoodsPurchaseVO   {
     @ApiModelProperty(value = "单据状态")
     private ExamineStatusEnum status;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "供应商编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/goods/GoodsSaleLedgerVO.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.gree.mall.manager.annotation.ZfireField;
 import com.gree.mall.manager.enums.material.UnitEnum;
-import com.gree.mall.manager.plus.entity.GoodsSaleLedger;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,12 +18,12 @@ public class GoodsSaleLedgerVO   {
 
     @ZfireField(hide = true)
     private String goodsSaleLedgerId;
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
     @ZfireField(hide = true)
     @ApiModelProperty(value = "品牌id")
     private String brandId;

mall-server-api/src/main/java/com/gree/mall/manager/bean/goods/GoodsStockVO.java

@@ -1,14 +1,10 @@
 package com.gree.mall.manager.bean.goods;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.IsEnum;
 import com.gree.mall.manager.enums.IsYesNoEnum;
 import com.gree.mall.manager.enums.material.UnitEnum;
-import com.gree.mall.manager.plus.entity.GoodsMaterial;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -28,12 +24,12 @@ public class GoodsStockVO    {
     @ZfireField(colName = "goods_material_id")
     @ApiModelProperty(value = "商品编号")
     private String goodsMaterialId;
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
     @ZfireField(hide = true)
     @ApiModelProperty(value = "品牌id")
     private String brandId;

mall-server-api/src/main/java/com/gree/mall/manager/bean/goods/PromotionGroupListVO.java

@@ -1,7 +1,5 @@
 package com.gree.mall.manager.bean.goods;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
 import com.gree.mall.manager.enums.StatusEnum;
 import io.swagger.annotations.ApiModelProperty;
@@ -40,12 +38,12 @@ public class PromotionGroupListVO {
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "企业微信id")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "企业微信id")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyName;
 
 
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/goods/SecKillActivityStageBeanVO.java

@@ -1,18 +1,11 @@
 package com.gree.mall.manager.bean.goods;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.CustomSecStatusEnum;
 import com.gree.mall.manager.enums.StatusEnum;
-import com.gree.mall.manager.plus.entity.SecKillActivity;
-import com.gree.mall.manager.plus.entity.SecKillStage;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
-import java.util.List;
 
 @Data
 @ZfireField(tbName = "a")
@@ -42,12 +35,12 @@ public class SecKillActivityStageBeanVO   {
 
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "企业微信id")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "企业微信id")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyName;
 
 
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/ChargingStandard2VO.java

@@ -37,8 +37,8 @@ public class ChargingStandard2VO {
     @ApiModelProperty("状态")
     private StatusEnum status;
 
-    @ApiModelProperty("商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty("商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty("创建人")
     private String createBy;

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/ChargingStandardTypeVO.java

@@ -31,8 +31,8 @@ public class ChargingStandardTypeVO {
     @ApiModelProperty("修改时间")
     private Date updateTime;
 
-    @ZfireField(hide = true)
-    private String companyWechatId;
-    @ApiModelProperty("商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    private String companyWechatId;
+//    @ApiModelProperty("商户名称")
+//    private String companyWechatName;
 }

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/ChargingStandardVO.java

@@ -38,8 +38,8 @@ public class ChargingStandardVO {
     @ApiModelProperty("状态")
     private StatusEnum status;
 
-    @ApiModelProperty("商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty("商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty("创建人")
     private String createBy;

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/PromotionQuestionnairVO.java

@@ -22,8 +22,8 @@ public class PromotionQuestionnairVO {
     //@ZfireField(hide = true)
     @ApiModelProperty("活动编号")
     private String id;
-    @ApiModelProperty("所属商户")
-    private String companyWechatName;
+//    @ApiModelProperty("所属商户")
+//    private String companyWechatName;
     @ApiModelProperty("活动名称")
     private String name;
     @ApiModelProperty("是否显示")

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/User2VO.java

@@ -18,11 +18,11 @@ public class User2VO {
     @ZfireField(hide = true)
     private String userId;
 
-    @ZfireField(hide = true)
-    private String companyWechatId;
-
-    @ApiModelProperty("商户名称")
-    private String companyName;
+//    @ZfireField(hide = true)
+//    private String companyWechatId;
+//
+//    @ApiModelProperty("商户名称")
+//    private String companyName;
 
     @ApiModelProperty("用户昵称")
     private String nickName;

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/UserCustomerVO.java

@@ -1,8 +1,6 @@
 package com.gree.mall.manager.bean.listvo;
 
 import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.ExamineStatusEnum;
-import com.gree.mall.manager.enums.IsEnum;
 import com.gree.mall.manager.enums.UserTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -18,11 +16,11 @@ public class UserCustomerVO {
     @ZfireField(hide = true)
     private String userId;
 
-    @ZfireField(hide = true)
-    private String companyWechatId;
-
-    @ApiModelProperty("商户名称")
-    private String companyName;
+//    @ZfireField(hide = true)
+//    private String companyWechatId;
+//
+//    @ApiModelProperty("商户名称")
+//    private String companyName;
 
     @ApiModelProperty("用户昵称")
     private String nickName;

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/UserVO.java

@@ -21,11 +21,11 @@ public class UserVO {
     @ZfireField(hide = true)
     private String userId;
 
-    @ZfireField(hide = true)
-    private String companyWechatId;
-
-    @ApiModelProperty("商户名称")
-    private String companyName;
+//    @ZfireField(hide = true)
+//    private String companyWechatId;
+//
+//    @ApiModelProperty("商户名称")
+//    private String companyName;
 
     @ZfireField(hide = true, tbName = "b", ignoreSelect = true)
     private String websitId;

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WebsitStockAccPVO.java

@@ -17,11 +17,11 @@ import java.util.Date;
 @Data
 public class WebsitStockAccPVO {
 
-    @ZfireField(hide = true)
-    @ApiModelProperty("所属商户id")
-    private String companyWechatId;
-    @ApiModelProperty("所属商户")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty("所属商户id")
+//    private String companyWechatId;
+//    @ApiModelProperty("所属商户")
+//    private String companyWechatName;
     @ZfireField(hide = true)
     private String websitId;
     @ApiModelProperty("网点名称")

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WebsitStockAccVO.java

@@ -17,10 +17,10 @@ import java.util.Date;
 @Data
 public class WebsitStockAccVO {
 
-    @ZfireField(hide = true)
-    private String companyWechatId;
-    @ApiModelProperty("所属商户")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    private String companyWechatId;
+//    @ApiModelProperty("所属商户")
+//    private String companyWechatName;
     @ZfireField(hide = true)
     private String websitId;
     @ApiModelProperty("网点名称")

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WebsitStockPVO.java

@@ -17,11 +17,11 @@ import java.util.Date;
 @Data
 public class WebsitStockPVO {
 
-    @ZfireField(hide = true)
-    @ApiModelProperty("所属商户id")
-    private String companyWechatId;
-    @ApiModelProperty("所属商户")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty("所属商户id")
+//    private String companyWechatId;
+//    @ApiModelProperty("所属商户")
+//    private String companyWechatName;
     @ZfireField(hide = true)
     private String websitId;
     @ApiModelProperty("网点名称")

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WebsitStockVO.java

@@ -16,11 +16,11 @@ import java.util.Date;
 @Data
 public class WebsitStockVO {
 
-    @ZfireField(hide = true)
-    @ApiModelProperty("所属商户id")
-    private String companyWechatId;
-    @ApiModelProperty("所属商户")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty("所属商户id")
+//    private String companyWechatId;
+//    @ApiModelProperty("所属商户")
+//    private String companyWechatName;
     @ZfireField(hide = true)
     private String websitId;
     @ApiModelProperty("网点名称")

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WorkerStockAccPVO.java

@@ -18,11 +18,11 @@ import java.util.Date;
 @Data
 public class WorkerStockAccPVO {
 
-    @ZfireField(hide = true)
-    @ApiModelProperty("所属商户id")
-    private String companyWechatId;
-    @ApiModelProperty("所属商户")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty("所属商户id")
+//    private String companyWechatId;
+//    @ApiModelProperty("所属商户")
+//    private String companyWechatName;
     @ZfireField(hide = true)
     private String websitId;
     @ApiModelProperty("网点名称")

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WorkerStockAccVO.java

@@ -17,10 +17,10 @@ import java.util.Date;
 @Data
 public class WorkerStockAccVO {
 
-    @ZfireField(hide = true)
-    private String companyWechatId;
-    @ApiModelProperty("所属商户")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    private String companyWechatId;
+//    @ApiModelProperty("所属商户")
+//    private String companyWechatName;
     @ZfireField(hide = true)
     private String websitId;
     @ApiModelProperty("网点名称")

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WorkerStockPVO.java

@@ -16,11 +16,11 @@ import java.util.Date;
 @Data
 public class WorkerStockPVO {
 
-    @ZfireField(hide = true)
-    @ApiModelProperty("所属商户id")
-    private String companyWechatId;
-    @ApiModelProperty("所属商户")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty("所属商户id")
+//    private String companyWechatId;
+//    @ApiModelProperty("所属商户")
+//    private String companyWechatName;
     @ZfireField(hide = true)
     private String websitId;
     @ApiModelProperty("网点名称")

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/material/WorkerStockVO.java

@@ -18,11 +18,11 @@ public class WorkerStockVO {
     @ZfireField(hide = true)
     @ApiModelProperty("id")
     private String id;
-    @ZfireField(hide = true)
-    @ApiModelProperty("所属商户id")
-    private String companyWechatId;
-    @ApiModelProperty("所属商户")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty("所属商户id")
+//    private String companyWechatId;
+//    @ApiModelProperty("所属商户")
+//    private String companyWechatName;
 //    @ZfireField(hide = true)
 //    private String websitId;
 //    @ApiModelProperty("网点名称")

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/order/PunishOrderVO.java

@@ -23,10 +23,10 @@ public class PunishOrderVO {
 
     @ApiModelProperty("处罚单号")
     public String id;
-    @ZfireField(hide = true)
-    private String companyWechatId;
-    @ApiModelProperty("商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    private String companyWechatId;
+//    @ApiModelProperty("商户名称")
+//    private String companyWechatName;
     @ApiModelProperty("状态")
     private ExamineStatusEnum status;
     @ApiModelProperty("处置工单类型")

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/workorder/OrderBase2VO.java

@@ -58,9 +58,9 @@ public class OrderBase2VO {
     @ApiModelProperty(value = "工单单号")
     private String id;
 
-    @ZfireField(sortNum = 12)
-    @ApiModelProperty(value = "所属商户")
-    private String companyWechatName;
+//    @ZfireField(sortNum = 12)
+//    @ApiModelProperty(value = "所属商户")
+//    private String companyWechatName;
 
     @ZfireField(sortNum = 13)
     @ApiModelProperty(value = "网点名称")

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/workorder/OrderBaseAppraiseVO.java

@@ -4,20 +4,18 @@ import com.gree.mall.manager.annotation.ZfireField;
 import com.gree.mall.manager.enums.workorder.AppraiseSourceEnum;
 import com.gree.mall.manager.enums.workorder.AppraiseStatusEnum;
 import com.gree.mall.manager.enums.workorder.OrderBaseStatusEnum;
-import com.gree.mall.manager.plus.entity.PgOrderFlag;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
-import java.util.List;
 
 @ZfireField(tbName = "a")
 @Data
 public class OrderBaseAppraiseVO {
 
-    @ZfireField(sortNum = 2)
-    @ApiModelProperty(value = "所属商户")
-    private String companyWechatName;
+//    @ZfireField(sortNum = 2)
+//    @ApiModelProperty(value = "所属商户")
+//    private String companyWechatName;
     @ZfireField(sortNum = 3)
     @ApiModelProperty(value = "网点名称")
     private String websitName;

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/workorder/OrderBaseVO.java

@@ -22,9 +22,9 @@ public class OrderBaseVO     {
     @ApiModelProperty(value="服务单标识")
     private List<PgOrderFlag> orderFlags = new ArrayList<>();
 
-    @ZfireField(sortNum = 2)
-    @ApiModelProperty(value = "所属商户")
-    private String companyWechatName;
+//    @ZfireField(sortNum = 2)
+//    @ApiModelProperty(value = "所属商户")
+//    private String companyWechatName;
     @ZfireField(sortNum = 3)
     @ApiModelProperty(value = "网点名称")
     private String websitName;

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/workorder/OrderSmallTypeVO.java

@@ -17,9 +17,9 @@ public class OrderSmallTypeVO {
     @ZfireField(hide = true)
     private String id;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty("所属商户id")
-    private String companyWechatId;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty("所属商户id")
+//    private String companyWechatId;
 
     @ZfireField(hide = true)
     private String orderType;

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/workorder/UserWaitVO.java

@@ -41,12 +41,12 @@ public class UserWaitVO {
     @ApiModelProperty("银行卡")
     private String bankAccount;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户id")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户id")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "创建时间")
     private Date createTime;

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/MaterialCategoryTree.java

@@ -17,11 +17,11 @@ public class MaterialCategoryTree {
     @ApiModelProperty(value = "父id")
     private String parentCategoryId;
 
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "备注")
     private String remark;

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/MaterialCategoryVO.java

@@ -18,8 +18,8 @@ public class MaterialCategoryVO {
     @ApiModelProperty(value = "分类编号")
     private String categoryId;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "父分类编号")
     private String parentCategoryId;

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WebsitGoodsAloneMVO.java

@@ -18,8 +18,8 @@ public class WebsitGoodsAloneMVO {
     @ApiModelProperty(value = "商品编号")
     private String goodsId;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "分类名称")
     private String categoryName;

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WebsitGoodsAlonePVO.java

@@ -14,8 +14,8 @@ import java.util.Date;
 @ZfireField(tbName = "a")
 public class WebsitGoodsAlonePVO {
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "商品编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WebsitGoodsMVO.java

@@ -18,8 +18,8 @@ public class WebsitGoodsMVO {
     @ApiModelProperty(value = "商品编号")
     private String goodsId;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "商品名称")
     private String goodsName;

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WebsitGoodsPVO.java

@@ -18,8 +18,8 @@ public class WebsitGoodsPVO {
     @ApiModelProperty(value = "商品编号")
     private String goodsId;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "商品名称")
     private String goodsName;

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WebsitNormChargeVO.java

@@ -19,8 +19,8 @@ public class WebsitNormChargeVO {
     @ApiModelProperty(value = "收费标准编号")
     private String normId;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "辅材名称")
     private String normName;

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitGoodsPriceVO.java

@@ -18,8 +18,8 @@ public class WebsitGoodsPriceVO {
     @ApiModelProperty(value = "商品价格id")
     private String id;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsConfigVO.java

@@ -18,12 +18,12 @@ public class WebsitPartsConfigVO {
     @ApiModelProperty(value = "id")
     private String id;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "网点编号")
     private String websitId;

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsRefundRecordVO.java

@@ -21,12 +21,12 @@ public class WebsitPartsRefundRecordVO {
     @ApiModelProperty(value = "记录号")
     private String recordId;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "网点编码")
     private String websitId;

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsSalesVO.java

@@ -17,8 +17,8 @@ public class WebsitPartsSalesVO {
     @ApiModelProperty("销售单号")
     private String id;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty("销售类型")
     private BuyPeopleEnum buyPeople;

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsSalesWVO.java

@@ -16,8 +16,8 @@ public class WebsitPartsSalesWVO {
     @ApiModelProperty("销售单号")
     private String id;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty("销售类型")
     private BuyPeopleEnum buyPeople;

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPurchaseAdjustmentVO.java

@@ -16,8 +16,8 @@ public class WebsitPurchaseAdjustmentVO {
     @ApiModelProperty(value = "单号")
     private String purchaseAdjustmentId;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPurchaseApplyVO.java

@@ -17,8 +17,8 @@ public class WebsitPurchaseApplyVO {
     @ApiModelProperty(value = "单号")
     private String purchaseId;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPurchaseOrderVO.java

@@ -17,8 +17,8 @@ public class WebsitPurchaseOrderVO {
     @ApiModelProperty(value = "单号")
     private String purchaseId;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPurchaseRetVO.java

@@ -17,8 +17,8 @@ public class WebsitPurchaseRetVO {
     @ApiModelProperty(value = "单号")
     private String purchaseRetId;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPurchaseVO.java

@@ -17,8 +17,8 @@ public class WebsitPurchaseVO {
     @ApiModelProperty(value = "单号")
     private String purchaseId;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitSalesVO.java

@@ -15,8 +15,8 @@ import java.util.Date;
 @ZfireField(tbName = "a")
 public class WebsitSalesVO {
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "单号")
     private String salesId;

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitTradeVO.java

@@ -22,12 +22,12 @@ public class WebsitTradeVO {
     @ApiModelProperty(value = "ID")
     private String id;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "商品类型")
     private WebsitGoodsTypeEnum goodsType;

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

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

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

@@ -14,12 +14,12 @@ import java.math.BigDecimal;
 @ZfireField(tbName = "a")
 public class WebsitVenderGoodsRelaVO {
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "供应商编号")

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

@@ -17,12 +17,12 @@ public class WebsitVenderGoodsVO {
     @ApiModelProperty(value = "单号")
     private String sheetId;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "供应商编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/worker/NewRefundManageVO.java

@@ -17,12 +17,12 @@ public class NewRefundManageVO {
     @ApiModelProperty(value = "申请单号")
     private String applyNo;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "销售单id")
     private String salesId;

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/worker/OldRefundManageVO.java

@@ -19,12 +19,12 @@ public class OldRefundManageVO {
     @ApiModelProperty(value = "申请单号")
     private String applyNo;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
 //    @ApiModelProperty(value = "申请类别")
 //    private PartsApplyCategoryEnum applyCategory;

mall-server-api/src/main/java/com/gree/mall/manager/bean/order/LeaseOrderVO.java

@@ -16,11 +16,11 @@ public class LeaseOrderVO {
     @ApiModelProperty(value = "id")
     private String id;
 
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "线上订单 true=是 false=否")
     private Boolean onLineBill;

mall-server-api/src/main/java/com/gree/mall/manager/bean/order/OrderShareVO.java

@@ -1,11 +1,7 @@
 package com.gree.mall.manager.bean.order;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
 import com.gree.mall.manager.enums.OrderSharePageEnum;
-import com.gree.mall.manager.enums.OrderShareStatusEnum;
-import com.gree.mall.manager.plus.entity.OrderShare;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -103,12 +99,12 @@ public class OrderShareVO   {
     @ApiModelProperty(value = "1=分销员带货 2=团购活动")
     private Integer flag;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "企业微信id")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "企业微信id")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "部门id")

mall-server-api/src/main/java/com/gree/mall/manager/bean/order/refund/OrderOfflineRefundVO.java

@@ -1,11 +1,9 @@
 package com.gree.mall.manager.bean.order.refund;
 
 import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.annotation.ZfireList;
 import com.gree.mall.manager.enums.ExamineStatusEnum;
 import com.gree.mall.manager.enums.SaleTypeEnum;
 import com.gree.mall.manager.enums.material.PayTypeEnum;
-import com.gree.mall.manager.plus.entity.OrderOfflineRefund;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,8 +25,8 @@ public class OrderOfflineRefundVO   {
     @ZfireField(hide = true)
     @ApiModelProperty("退货单号")
     private String id;
-    @ApiModelProperty("所属商户")
-    private String companyWechatName;
+//    @ApiModelProperty("所属商户")
+//    private String companyWechatName;
     @ApiModelProperty("订单号")
     private String orderId;
     @ApiModelProperty("状态")

mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/SettleExpenseItemVO.java

@@ -26,13 +26,13 @@ public class SettleExpenseItemVO {
     @ApiModelProperty(value = "结算汇总id")
     private String settleExpenseId;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "网点编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/SettleExpenseVO.java

@@ -18,12 +18,12 @@ public class SettleExpenseVO {
     @ApiModelProperty(value = "id")
     private String id;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "所属商户")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "所属商户")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "网点名称")
     private String websitName;

mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/SettleMonthWagesVO.java

@@ -18,12 +18,12 @@ public class SettleMonthWagesVO {
     @ApiModelProperty(value = "id")
     private String id;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "所属商户")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "所属商户")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "汇总名称")
     private String name;

mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/SettleMonthWagesWorkerVO.java

@@ -26,12 +26,12 @@ public class SettleMonthWagesWorkerVO {
     @ApiModelProperty(value = "月度工资详情id")
     private String settleMonthWagesDetailId;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "所属商户")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "所属商户")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "师傅id")

mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/repair/AllDailyImportSummaryItemVO.java

@@ -19,8 +19,8 @@ public class AllDailyImportSummaryItemVO {
     @ApiModelProperty(value = "id")
     private String id;
 
-    @ApiModelProperty(value = "所属商户")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "所属商户")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "导入批次号")
     private String importBatchNo;

mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/repair/DailyImportSummaryVO.java

@@ -14,8 +14,8 @@ import java.util.Date;
 @ZfireField(tbName = "a")
 public class DailyImportSummaryVO {
 
-    @ApiModelProperty(value = "所属商户")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "所属商户")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "导入批次号")
     private String importBatchNo;

mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/repair/DailyIncrDecrCostCountVO.java

@@ -14,8 +14,8 @@ import java.util.Date;
 @ZfireField(tbName = "a")
 public class DailyIncrDecrCostCountVO {
 
-    @ApiModelProperty(value = "所属商户")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "所属商户")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "导入批次号")
     private String importBatchNo;

mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/repair/DailyIncrDecrCostVO.java

@@ -17,12 +17,12 @@ public class DailyIncrDecrCostVO {
     @ApiModelProperty(value = "id")
     private String id;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户id")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "所属商户")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户id")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "所属商户")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "服务人员编号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/repair/DailyReduceCostGatherVO.java

@@ -14,8 +14,8 @@ import java.util.Date;
 @ZfireField(tbName = "a")
 public class DailyReduceCostGatherVO {
 
-    @ApiModelProperty(value = "所属商户")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "所属商户")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "导入批次号")
     private String importBatchNo;

mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/repair/DailyReduceCostVO.java

@@ -21,8 +21,8 @@ public class DailyReduceCostVO {
     @ApiModelProperty(value = "导入批次号")
     private String importBatchNo;
 
-    @ApiModelProperty(value = "所属商户")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "所属商户")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "派工序号")
     private String dispatchOrderNo;

mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/repair/DailySummaryDataVO.java

@@ -13,8 +13,8 @@ import java.math.BigDecimal;
 @ZfireField(tbName = "a")
 public class DailySummaryDataVO {
 
-    @ApiModelProperty(value = "所属商户")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "所属商户")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "汇总批次号")
     private String summaryBatchNo;

mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/repair/DailyWithholdVO.java

@@ -17,8 +17,8 @@ public class DailyWithholdVO {
     @ApiModelProperty(value = "暂扣费用id")
     private String id;
 
-    @ApiModelProperty(value = "所属商户")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "所属商户")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "费用名称")
     private String name;

mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/repair/SettleDailyBankTransferRecordVO.java

@@ -23,8 +23,8 @@ public class SettleDailyBankTransferRecordVO {
     @ApiModelProperty(value = "商户id")
     private String companyWechatId;
 
-    @ApiModelProperty(value = "所属商户")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "所属商户")
+//    private String companyWechatName;
 
     @ZfireField(hide = true)
     @ApiModelProperty(value = "调用时间")

mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/repair/WorkerWaitBuckleVO.java

@@ -15,8 +15,8 @@ import java.util.Date;
 @ZfireField(tbName = "a")
 public class WorkerWaitBuckleVO {
 
-    @ApiModelProperty(value = "所属商户")
-    private String companyWechatName;
+//    @ApiModelProperty(value = "所属商户")
+//    private String companyWechatName;
 
     @ApiModelProperty("费用发生时间")
     private Date createTime;

mall-server-api/src/main/java/com/gree/mall/manager/bean/tax/OrderTaxVO.java

@@ -9,7 +9,6 @@ import com.gree.mall.manager.enums.IsTaxEnum;
 import com.gree.mall.manager.enums.IsTaxTypeEnum;
 import com.gree.mall.manager.enums.TaxOrderTypeEnum;
 import com.gree.mall.manager.enums.TaxTypeEnum;
-import com.gree.mall.manager.plus.entity.OrderTax;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -25,12 +24,12 @@ public class OrderTaxVO   {
     @TableId(value = "order_tax_id", type = IdType.ID_WORKER_STR)
     private String orderTaxId;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "企业微信id")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "所属商户")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "企业微信id")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "所属商户")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "订单编号")
     private String orderId;

mall-server-api/src/main/java/com/gree/mall/manager/bean/trade/GoodsCategoryItemVO.java

@@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.es.CarouselMapPortEnum;
 import com.gree.mall.manager.enums.material.StateEnum;
-import com.gree.mall.manager.enums.material.TypeGoodsCategoryEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -23,8 +21,8 @@ public class GoodsCategoryItemVO     {
     @TableId(value = "id", type = IdType.ID_WORKER_STR)
     private String id;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyName;
 
 
     @ZfireField(hide = true)

mall-server-api/src/main/java/com/gree/mall/manager/bean/trade/GoodsCategoryOtherItemVO.java

@@ -23,8 +23,8 @@ public class GoodsCategoryOtherItemVO {
     @TableId(value = "id", type = IdType.ID_WORKER_STR)
     private String id;
 
-    @ApiModelProperty(value = "商户名称")
-    private String companyName;
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyName;
 
 
     @ZfireField(hide = true)

mall-server-api/src/main/java/com/gree/mall/manager/bean/trade/OldProductManagerVO.java

@@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
 import com.gree.mall.manager.enums.OldManagerTypeStatusEnum;
 import com.gree.mall.manager.enums.SaleTypeEnum;
-import com.gree.mall.manager.plus.entity.OldProductManager;
-import com.gree.mall.manager.plus.entity.OldProductManagerItem;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -28,9 +26,9 @@ public class OldProductManagerVO     {
     @ApiModelProperty(value = "企业微信id")
     private String companyWechatId;
 
-    @ZfireField(tbName = "a")
-    @ApiModelProperty(value = "所属商户")
-    private String companyName;
+//    @ZfireField(tbName = "a")
+//    @ApiModelProperty(value = "所属商户")
+//    private String companyName;
 
     @ZfireField(tbName = "a")
     @ApiModelProperty(value = "订单号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/websit/SettlementOrderLogicVO.java

@@ -17,12 +17,12 @@ public class SettlementOrderLogicVO      {
     @ApiModelProperty(value = "结算订单号")
     private String settlementOrderId;
 
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
+//    @ZfireField(hide = true)
+//    @ApiModelProperty(value = "商户编号")
+//    private String companyWechatId;
+//
+//    @ApiModelProperty(value = "商户名称")
+//    private String companyWechatName;
 
     @ApiModelProperty(value = "网点编号")
     private String websitId;