Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaSupplierInfo.java

@@ -1,5 +1,6 @@
 package com.bonus.sgzb.base.domain;
 
+import com.bonus.sgzb.common.core.annotation.Excel;
 import com.bonus.sgzb.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,30 +24,37 @@ public class MaSupplierInfo extends BaseEntity
 
     /** 名称 */
     @ApiModelProperty(value = "名称")
+    @Excel(name = "供应商名称")
     private String supplier;
 
     /** 地址 */
     @ApiModelProperty(value = "地址")
+    @Excel(name = "供应商地址")
     private String address;
 
     /** 法人代表 */
     @ApiModelProperty(value = "法人代表")
+    @Excel(name = "法人代表")
     private String legalPerson;
 
     /** 主要联系人 */
     @ApiModelProperty(value = "主要联系人")
+    @Excel(name = "主要联系人")
     private String primaryContact;
 
     /** 联系方式 */
     @ApiModelProperty(value = "联系方式")
+    @Excel(name = "联系方式")
     private String phone;
 
     /** 经营范围 */
     @ApiModelProperty(value = "经营范围")
+    @Excel(name = "经营范围")
     private String businessScope;
 
     /** 营业执照 */
     @ApiModelProperty(value = "营业执照")
+    @Excel(name = "营业执照")
     private String businessLicense;
 
     /** 删除标志（0代表存在 2代表删除） */