导出列调整

srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseCompanyInformation.java

@@ -55,7 +55,7 @@ public class BaseCompanyInformation implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(status)", width = 15)
+//	@Excel(name = "状态(status)", width = 15)
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
@@ -64,7 +64,7 @@ public class BaseCompanyInformation implements Serializable {
     @TableLogic
     private Integer delFlag;
 	/**名称*/
-	@Excel(name = "名称", width = 15)
+	@Excel(name = "名称(name)", width = 15)
     @ApiModelProperty(value = "名称")
     private String name;
 	/**编码*/
@@ -72,27 +72,27 @@ public class BaseCompanyInformation implements Serializable {
     @ApiModelProperty(value = "编码")
     private String code;
 	/**税号*/
-	@Excel(name = "税号", width = 15)
+	@Excel(name = "税号(taxcode)", width = 15)
     @ApiModelProperty(value = "税号")
     private String taxcode;
 	/**单位地址*/
-	@Excel(name = "单位地址", width = 15)
+	@Excel(name = "单位地址(address)", width = 15)
     @ApiModelProperty(value = "单位地址")
     private String address;
 	/**电话*/
-	@Excel(name = "电话", width = 15)
+	@Excel(name = "电话telphone)", width = 15)
     @ApiModelProperty(value = "电话")
     private String telphone;
 	/**开户行*/
-	@Excel(name = "开户行", width = 15)
+	@Excel(name = "开户行(bank)", width = 15)
     @ApiModelProperty(value = "开户行")
     private String bank;
 	/**银行账户*/
-	@Excel(name = "银行账户", width = 15)
+	@Excel(name = "银行账户bank account)", width = 15)
     @ApiModelProperty(value = "银行账户")
     private String bankAccount;
 	/**排序号*/
-	@Excel(name = "排序号", width = 15)
+	@Excel(name = "排序号(order)", width = 15)
     @ApiModelProperty(value = "排序号")
     private Double reorder;
 }

srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseExchangeRate.java

@@ -55,28 +55,28 @@ public class BaseExchangeRate implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+//	@Excel(name = "状态(1-启用,0-停用)", width = 15)
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
 	/**币种*/
-	@Excel(name = "币种", width = 15)
+	@Excel(name = "币种(currency)", width = 15)
     @ApiModelProperty(value = "币种")
     private String currency;
 	/**年度*/
-	@Excel(name = "年度", width = 15)
+	@Excel(name = "年度(year)", width = 15)
     @ApiModelProperty(value = "年度")
     private String year;
 	/**月度*/
-	@Excel(name = "月度", width = 15)
+	@Excel(name = "月度(month)", width = 15)
     @ApiModelProperty(value = "月度")
     private String month;
 	/**汇率*/
-	@Excel(name = "汇率", width = 15)
+	@Excel(name = "汇率(exchange rate)", width = 15)
     @ApiModelProperty(value = "汇率")
     private Double exchangeRate;
 }

srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseProductArchive.java

@@ -55,81 +55,81 @@ public class BaseProductArchive implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+	@Excel(name = "状态(status)", width = 15)
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     @Dict(dicCode = "valid_status")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
 	/**产品分类*/
-	@Excel(name = "产品分类", width = 15)
+	@Excel(name = "分类(class)", width = 15)
     @ApiModelProperty(value = "产品分类")
     private String classId;
 	/**编码*/
-	@Excel(name = "编码", width = 15)
+	@Excel(name = "编码(code)", width = 15)
     @ApiModelProperty(value = "编码")
     private String code;
 	/**中文名*/
-	@Excel(name = "中文名", width = 15)
+	@Excel(name = "中文名(chinase name)", width = 15)
     @ApiModelProperty(value = "中文名")
     private String chineseName;
 	/**英文名*/
-	@Excel(name = "英文名", width = 15)
+	@Excel(name = "英文名(english name)", width = 15)
     @ApiModelProperty(value = "英文名")
     private String englishName;
 	/**中文别名*/
-	@Excel(name = "中文别名", width = 15)
+	@Excel(name = "中文别名(chinese alias)", width = 15)
     @ApiModelProperty(value = "中文别名")
     private String chineseAlias;
 	/**英文别名*/
-	@Excel(name = "英文别名", width = 15)
+	@Excel(name = "英文别名(english alias)", width = 15)
     @ApiModelProperty(value = "英文别名")
     private String englishAlias;
 	/**型号*/
-	@Excel(name = "型号", width = 15)
+	@Excel(name = "型号(model)", width = 15)
     @ApiModelProperty(value = "型号")
     private String model;
 	/**规格*/
-	@Excel(name = "规格", width = 15)
+	@Excel(name = "规格(specifications)", width = 15)
     @ApiModelProperty(value = "规格")
     private String specifications;
 	/**备件号*/
-	@Excel(name = "备件号", width = 15)
+//	@Excel(name = "备件号", width = 15)
     @ApiModelProperty(value = "备件号")
     private String partno;
 	/**订货号*/
-	@Excel(name = "订货号", width = 15)
+//	@Excel(name = "订货号", width = 15)
     @ApiModelProperty(value = "订货号")
     private String orderno;
 	/**图号*/
-	@Excel(name = "图号", width = 15)
+//	@Excel(name = "图号", width = 15)
     @ApiModelProperty(value = "图号")
     private String drawingno;
 	/**税率*/
-	@Excel(name = "税率", width = 15)
+	@Excel(name = "税率(tax rate)", width = 15)
     @ApiModelProperty(value = "税率")
     private Double taxRate;
 	/**计量单位*/
-	@Excel(name = "计量单位", width = 15)
+	@Excel(name = "计量单位(measurementunit)", width = 15)
     @ApiModelProperty(value = "计量单位")
     private String measurementUnit;
 	/**有害物质(1-是,0-否)*/
-	@Excel(name = "有害物质(1-是,0-否)", width = 15)
+	@Excel(name = "有害物质(harmful substances)", width = 15)
     @ApiModelProperty(value = "有害物质(1-是,0-否)")
     private Integer harmfulSubstances;
 	/**虚拟产品(1-是,0-否)*/
-	@Excel(name = "虚拟产品(1-是,0-否)", width = 15)
+	@Excel(name = "虚拟产品(virtual product)", width = 15)
     @ApiModelProperty(value = "虚拟产品(1-是,0-否)")
     private Integer virtualProduct;
 	/**返佣(1-是,0-否)*/
-	@Excel(name = "返佣(1-是,0-否)", width = 15)
+//	@Excel(name = "返佣(1-是,0-否)", width = 15)
     @ApiModelProperty(value = "返佣(1-是,0-否)")
     private Integer commissionRebate;
 	/**备注*/
-	@Excel(name = "备注", width = 15)
+//	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private String notes;
 }

srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseProductClass.java

@@ -55,32 +55,32 @@ public class BaseProductClass implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-正常,2-冻结)*/
-	@Excel(name = "状态(1-正常,2-冻结)", width = 15)
+//	@Excel(name = "状态(1-正常,2-冻结)", width = 15)
     @ApiModelProperty(value = "状态(1-正常,2-冻结)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
 	/**编码*/
-	@Excel(name = "编码", width = 15)
+	@Excel(name = "编码(code)", width = 15)
     @ApiModelProperty(value = "编码")
     private String code;
 	/**名称*/
-	@Excel(name = "名称", width = 15)
+	@Excel(name = "名称(name)", width = 15)
     @ApiModelProperty(value = "名称")
     private String name;
 	/**父级主键*/
-	@Excel(name = "父级主键", width = 15)
+	@Excel(name = "上级分类(parent)", width = 15)
     @ApiModelProperty(value = "父级主键")
     private Integer parentId;
 	/**毛利率*/
-	@Excel(name = "毛利率", width = 15)
+	@Excel(name = "毛利率(gross margin)", width = 15)
     @ApiModelProperty(value = "毛利率")
     private Double grossMargin;
 	/**税率*/
-	@Excel(name = "税率", width = 15)
+	@Excel(name = "税率(tax rate)", width = 15)
     @ApiModelProperty(value = "税率")
     private Double taxRate;
 }

srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseProjectArchive.java

@@ -41,10 +41,12 @@ public class BaseProjectArchive implements Serializable {
 	/**创建人*/
 	@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
     @ApiModelProperty(value = "创建人")
+    @Excel(name = "创建人(create by)", width = 15)
     private String createBy;
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间(create time)", width = 15)
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 	/**更新人*/
@@ -56,28 +58,28 @@ public class BaseProjectArchive implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+//	@Excel(name = "状态(1-启用,0-停用)", width = 15)
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
 	/**名称*/
-	@Excel(name = "名称", width = 15)
+	@Excel(name = "名称(name)", width = 15)
     @ApiModelProperty(value = "名称")
     private String name;
 	/**编码*/
-	@Excel(name = "编码", width = 15)
+	@Excel(name = "编码(code)", width = 15)
     @ApiModelProperty(value = "编码")
     private String code;
 	/**客户*/
-	@Excel(name = "客户", width = 15)
+	@Excel(name = "客户(customer)", width = 15)
     @ApiModelProperty(value = "客户")
     private String customerId;
 	/**备注*/
-	@Excel(name = "备注", width = 15)
+	@Excel(name = "备注(notes)", width = 15)
     @ApiModelProperty(value = "备注")
     private String notes;
 }

srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseShipArchive.java

@@ -55,21 +55,21 @@ public class BaseShipArchive implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+	@Excel(name = "状态(status)", width = 15)
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     @Dict(dicCode = "valid_status")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
 	/**唯一编号*/
-	@Excel(name = "唯一编号", width = 15)
+	@Excel(name = "唯一编号(IMO)", width = 15)
     @ApiModelProperty(value = "唯一编号")
     private String imo;
 	/**船名称*/
-	@Excel(name = "船名称", width = 15)
+	@Excel(name = "船名称(ship name)", width = 15)
     @ApiModelProperty(value = "船名称")
     private String shipName;
 	/**hull number*/
@@ -77,25 +77,25 @@ public class BaseShipArchive implements Serializable {
     @ApiModelProperty(value = "hull number")
     private String hullNumber;
 	/**船类型*/
-	@Excel(name = "船类型", width = 15)
+	@Excel(name = "船类型(ship type)", width = 15)
     @ApiModelProperty(value = "船类型")
     private String shipType;
 	/**船厂*/
-	@Excel(name = "船厂", width = 15)
+	@Excel(name = "船厂(ship factory)", width = 15)
     @ApiModelProperty(value = "船厂")
     private String shipFactory;
 	/**关联客户*/
-	@Excel(name = "关联客户", width = 15)
+	@Excel(name = "关联客户(relate customer)", width = 15)
     @ApiModelProperty(value = "关联客户")
     private String relateCustomer;
 	/**造船日期*/
-	@Excel(name = "造船日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@Excel(name = "造船日期(ship date)", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "造船日期")
     private Date shipDate;
 	/**备注*/
-	@Excel(name = "备注", width = 15)
+//	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private String notes;
 }

srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseShipArchiveAccessories.java

@@ -55,40 +55,40 @@ public class BaseShipArchiveAccessories implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+//	@Excel(name = "状态(1-启用,0-停用)", width = 15)
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
 	/**主表主键（船舶档案）*/
-	@Excel(name = "主表主键（船舶档案）", width = 15)
+//	@Excel(name = "主表主键（船舶档案）", width = 15)
     @ApiModelProperty(value = "主表主键（船舶档案）")
     private String headId;
 	/**配件类型*/
-	@Excel(name = "配件类型", width = 15)
+//	@Excel(name = "配件类型", width = 15)
     @ApiModelProperty(value = "配件类型")
     private String accessoryType;
 	/**规格*/
-	@Excel(name = "规格", width = 15)
+//	@Excel(name = "规格", width = 15)
     @ApiModelProperty(value = "规格")
     private String specifications;
 	/**型号*/
-	@Excel(name = "型号", width = 15)
+//	@Excel(name = "型号", width = 15)
     @ApiModelProperty(value = "型号")
     private String model;
 	/**序列号*/
-	@Excel(name = "序列号", width = 15)
+//	@Excel(name = "序列号", width = 15)
     @ApiModelProperty(value = "序列号")
     private Integer serialNumber;
 	/**备注*/
-	@Excel(name = "备注", width = 15)
+//	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private String notes;
 	/**附件*/
-	@Excel(name = "附件", width = 15)
+//	@Excel(name = "附件", width = 15)
     @ApiModelProperty(value = "附件")
     private String attachs;
 }

srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseShipArchiveRelateCustomer.java

@@ -55,32 +55,32 @@ public class BaseShipArchiveRelateCustomer implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+//	@Excel(name = "状态(1-启用,0-停用)", width = 15)
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
 	/**主表主键（船舶档案）*/
-	@Excel(name = "主表主键（船舶档案）", width = 15)
+//	@Excel(name = "主表主键（船舶档案）", width = 15)
     @ApiModelProperty(value = "主表主键（船舶档案）")
     private String headId;
 	/**唯一编号*/
-	@Excel(name = "唯一编号", width = 15)
+//	@Excel(name = "唯一编号", width = 15)
     @ApiModelProperty(value = "唯一编号")
     private String imo;
 	/**名称*/
-	@Excel(name = "名称", width = 15)
+//	@Excel(name = "名称", width = 15)
     @ApiModelProperty(value = "名称")
     private String name;
 	/**客户*/
-	@Excel(name = "客户", width = 15)
+//	@Excel(name = "客户", width = 15)
     @ApiModelProperty(value = "客户")
     private String customerId;
 	/**开始日期*/
-	@Excel(name = "开始日期", width = 20, format = "yyyy-MM-dd")
+//	@Excel(name = "开始日期", width = 20, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "开始日期")

srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/BaseTemplates.java

@@ -55,24 +55,24 @@ public class BaseTemplates implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+//	@Excel(name = "状态(1-启用,0-停用)", width = 15)
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
 	/**模板类型*/
-	@Excel(name = "模板类型", width = 15)
+//	@Excel(name = "模板类型", width = 15)
     @ApiModelProperty(value = "模板类型")
     private String templateType;
 	/**模板名称*/
-	@Excel(name = "模板名称", width = 15)
+//	@Excel(name = "模板名称", width = 15)
     @ApiModelProperty(value = "模板名称")
     private String templateName;
 	/**模板地址*/
-	@Excel(name = "模板地址", width = 15)
+//	@Excel(name = "模板地址", width = 15)
     @ApiModelProperty(value = "模板地址")
     private String templateFile;
 }

srm-module-code/src/main/java/com/cuidian/srm/baseCode/entity/SerialPattern.java

@@ -39,19 +39,19 @@ public class SerialPattern implements Serializable {
     @ApiModelProperty(value = "主键id")
     private String id;
 	/**字段所属表格名称*/
-	@Excel(name = "字段所属表格名称", width = 15)
+//	@Excel(name = "字段所属表格名称", width = 15)
     @ApiModelProperty(value = "字段所属表格名称")
     private String tableName;
 	/**字段名称*/
-	@Excel(name = "字段名称", width = 15)
+//	@Excel(name = "字段名称", width = 15)
     @ApiModelProperty(value = "字段名称")
     private String fieldName;
 	/**编号模式，支持前缀，年月日时分秒，自增号混编模式。多个部分用英文加号(+)分隔。前缀支持字符串(用大括号括起来{})和同一表其他字段(用中括号括起来)。年月日时分秒必须连一起，如yyyyMMddHHmmss，可以是其中的一部分。自增编号就是一个数字，譬如4，就是表示4位长度。*/
-	@Excel(name = "编号模式，支持前缀，年月日时分秒，自增号混编模式。多个部分用英文加号(+)分隔。前缀支持字符串(用大括号括起来{})和同一表其他字段(用中括号括起来)。年月日时分秒必须连一起，如yyyyMMddHHmmss，可以是其中的一部分。自增编号就是一个数字，譬如4，就是表示4位长度。", width = 15)
+//	@Excel(name = "编号模式，支持前缀，年月日时分秒，自增号混编模式。多个部分用英文加号(+)分隔。前缀支持字符串(用大括号括起来{})和同一表其他字段(用中括号括起来)。年月日时分秒必须连一起，如yyyyMMddHHmmss，可以是其中的一部分。自增编号就是一个数字，譬如4，就是表示4位长度。", width = 15)
     @ApiModelProperty(value = "编号模式，支持前缀，年月日时分秒，自增号混编模式。多个部分用英文加号(+)分隔。前缀支持字符串(用大括号括起来{})和同一表其他字段(用中括号括起来)。年月日时分秒必须连一起，如yyyyMMddHHmmss，可以是其中的一部分。自增编号就是一个数字，譬如4，就是表示4位长度。")
     private String serialPattern;
 	/**描述*/
-	@Excel(name = "描述", width = 15)
+//	@Excel(name = "描述", width = 15)
     @ApiModelProperty(value = "描述")
     private String description;
 	/**创建人*/
@@ -71,11 +71,11 @@ public class SerialPattern implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+//	@Excel(name = "状态(1-启用,0-停用)", width = 15)
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;

srm-module-code/src/main/java/com/cuidian/srm/cuspCode/entity/CuspCustomerProfile.java

@@ -50,104 +50,104 @@ public class CuspCustomerProfile implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+	@Excel(name = "状态(status)", width = 15)
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
 	/**编码*/
-	@Excel(name = "编码", width = 15)
+	@Excel(name = "编码(code)", width = 15)
     @ApiModelProperty(value = "编码")
     private String code;
 	/**名称*/
-	@Excel(name = "名称", width = 15)
+	@Excel(name = "名称(name)", width = 15)
     @ApiModelProperty(value = "名称")
     private String name;
 	/**简称*/
-	@Excel(name = "简称", width = 15)
+	@Excel(name = "简称(abbreviation)", width = 15)
     @ApiModelProperty(value = "简称")
     private String abbreviation;
 	/**曾用名*/
-	@Excel(name = "曾用名", width = 15)
+//	@Excel(name = "曾用名", width = 15)
     @ApiModelProperty(value = "曾用名")
     private String nameUsedBefore;
 	/**税号*/
-	@Excel(name = "税号", width = 15)
+	@Excel(name = "税号(duty paragraph)", width = 15)
     @ApiModelProperty(value = "税号")
     private String dutyParagraph;
 	/**法人*/
-	@Excel(name = "法人", width = 15)
+	@Excel(name = "法人(legal person)", width = 15)
     @ApiModelProperty(value = "法人")
     private String legalPerson;
 	/**联系人*/
-	@Excel(name = "联系人", width = 15)
+	@Excel(name = "联系人(contacts)", width = 15)
     @ApiModelProperty(value = "联系人")
     private String contacts;
 	/**联系电话*/
-	@Excel(name = "联系电话", width = 15)
+	@Excel(name = "联系电话(phone)", width = 15)
     @ApiModelProperty(value = "联系电话")
     private String phone;
 	/**邮箱*/
-	@Excel(name = "邮箱", width = 15)
+//	@Excel(name = "邮箱", width = 15)
     @ApiModelProperty(value = "邮箱")
     private String email;
 	/**注册地址*/
-	@Excel(name = "注册地址", width = 15)
+//	@Excel(name = "注册地址", width = 15)
     @ApiModelProperty(value = "注册地址")
     private String registerAddress;
 	/**办公地址*/
-	@Excel(name = "办公地址", width = 15)
+//	@Excel(name = "办公地址", width = 15)
     @ApiModelProperty(value = "办公地址")
     private String officeAddress;
 	/**发票地址*/
-	@Excel(name = "发票地址", width = 15)
+//	@Excel(name = "发票地址", width = 15)
     @ApiModelProperty(value = "发票地址")
     private String invoiceAddress;
 	/**币种*/
-	@Excel(name = "币种", width = 15)
+//	@Excel(name = "币种", width = 15)
     @ApiModelProperty(value = "币种")
     private String currency;
 	/**国家*/
-	@Excel(name = "国家", width = 15)
+	@Excel(name = "国家(country)", width = 15)
     @ApiModelProperty(value = "国家")
     private String country;
 	/**付款条件*/
-	@Excel(name = "付款条件", width = 15)
+	@Excel(name = "付款条件(payment terms)", width = 15)
     @ApiModelProperty(value = "付款条件")
     private String paymentTerms;
 	/**信用额度*/
-	@Excel(name = "信用额度", width = 15)
+	@Excel(name = "信用额度(credit limit)", width = 15)
     @ApiModelProperty(value = "信用额度")
     private java.math.BigDecimal creditLimit;
 	/**折扣*/
-	@Excel(name = "折扣", width = 15)
+	@Excel(name = "折扣(discount)", width = 15)
     @ApiModelProperty(value = "折扣")
     private Double discount;
 	/**佣金*/
-	@Excel(name = "佣金", width = 15)
+	@Excel(name = "佣金(commission)", width = 15)
     @ApiModelProperty(value = "佣金")
     private java.math.BigDecimal commission;
 	/**中间人*/
-	@Excel(name = "中间人", width = 15)
+	@Excel(name = "中间人(intermediator)", width = 15)
     @ApiModelProperty(value = "中间人")
     private String intermediator;
 	/**中间人佣金*/
-	@Excel(name = "中间人佣金", width = 15)
+	@Excel(name = "中间人佣金(intermediator commission)", width = 15)
     @ApiModelProperty(value = "中间人佣金")
     private java.math.BigDecimal intermediatorCommission;
 	/**优先级*/
-	@Excel(name = "优先级", width = 15)
+	@Excel(name = "优先级(priority)", width = 15)
     @ApiModelProperty(value = "优先级")
     private String priority;
 	/**备注*/
-	@Excel(name = "备注", width = 15)
+//	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private String notes;
 	/**文件*/
-	@Excel(name = "文件", width = 15)
+//	@Excel(name = "文件", width = 15)
     @ApiModelProperty(value = "文件")
     private String files;
 }

srm-module-code/src/main/java/com/cuidian/srm/cuspCode/entity/CuspCustomerProfileMan.java

@@ -49,11 +49,11 @@ public class CuspCustomerProfileMan implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+//	@Excel(name = "状态(1-启用,0-停用)", width = 15)
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -61,23 +61,23 @@ public class CuspCustomerProfileMan implements Serializable {
     @ApiModelProperty(value = "主表主键（客户档案）")
     private String headId;
 	/**编码*/
-	@Excel(name = "编码", width = 15)
+//	@Excel(name = "编码", width = 15)
     @ApiModelProperty(value = "编码")
     private String code;
 	/**姓名*/
-	@Excel(name = "姓名", width = 15)
+//	@Excel(name = "姓名", width = 15)
     @ApiModelProperty(value = "姓名")
     private String name;
 	/**电话*/
-	@Excel(name = "电话", width = 15)
+//	@Excel(name = "电话", width = 15)
     @ApiModelProperty(value = "电话")
     private String mobile;
 	/**邮箱*/
-	@Excel(name = "邮箱", width = 15)
+//	@Excel(name = "邮箱", width = 15)
     @ApiModelProperty(value = "邮箱")
     private String email;
 	/**职位*/
-	@Excel(name = "职位", width = 15)
+//	@Excel(name = "职位", width = 15)
     @ApiModelProperty(value = "职位")
     private String position;
 }

srm-module-code/src/main/java/com/cuidian/srm/cuspCode/entity/CuspIntermediator.java

@@ -55,56 +55,56 @@ public class CuspIntermediator implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+	@Excel(name = "状态(status)", width = 15)
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
 	/**编码*/
-	@Excel(name = "编码", width = 15)
+	@Excel(name = "编码(code)", width = 15)
     @ApiModelProperty(value = "编码")
     private String code;
 	/**名称*/
-	@Excel(name = "名称", width = 15)
+	@Excel(name = "名称(name)", width = 15)
     @ApiModelProperty(value = "名称")
     private String name;
 	/**简称*/
-	@Excel(name = "简称", width = 15)
+	@Excel(name = "简称(abbreviation)", width = 15)
     @ApiModelProperty(value = "简称")
     private String abbreviation;
 	/**税号*/
-	@Excel(name = "税号", width = 15)
+	@Excel(name = "税号(duty paragraph)", width = 15)
     @ApiModelProperty(value = "税号")
     private String dutyParagraph;
 	/**法人*/
-	@Excel(name = "法人", width = 15)
+	@Excel(name = "法人(legal person)", width = 15)
     @ApiModelProperty(value = "法人")
     private String legalPerson;
 	/**联系人*/
-	@Excel(name = "联系人", width = 15)
+	@Excel(name = "联系人(contacts)", width = 15)
     @ApiModelProperty(value = "联系人")
     private String contacts;
 	/**联系电话*/
-	@Excel(name = "联系电话", width = 15)
+	@Excel(name = "联系电话(phone)", width = 15)
     @ApiModelProperty(value = "联系电话")
     private String phone;
 	/**办公地址*/
-	@Excel(name = "办公地址", width = 15)
+//	@Excel(name = "办公地址", width = 15)
     @ApiModelProperty(value = "办公地址")
     private String address;
 	/**邮箱*/
-	@Excel(name = "邮箱", width = 15)
+//	@Excel(name = "邮箱", width = 15)
     @ApiModelProperty(value = "邮箱")
     private String email;
 	/**国家*/
-	@Excel(name = "国家", width = 15)
+	@Excel(name = "国家(country)", width = 15)
     @ApiModelProperty(value = "国家")
     private String country;
 	/**备注*/
-	@Excel(name = "备注", width = 15)
+//	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private String notes;
 }

srm-module-code/src/main/java/com/cuidian/srm/cuspCode/entity/CuspSupplierEvaluation.java

@@ -50,42 +50,42 @@ public class CuspSupplierEvaluation implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+//	@Excel(name = "状态(1-启用,0-停用)", width = 15)
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
 	/**单据日期*/
-	@Excel(name = "单据日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@Excel(name = "单据日期(bill date)", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "单据日期")
     private Date billDate;
 	/**考评单号*/
-	@Excel(name = "考评单号", width = 15)
+	@Excel(name = "考评单号(bill code)", width = 15)
     @ApiModelProperty(value = "考评单号")
     private String billCode;
 	/**供应商*/
-	@Excel(name = "供应商", width = 15)
+	@Excel(name = "供应商(supplier)", width = 15)
     @ApiModelProperty(value = "供应商")
     private Integer supplierId;
 	/**考评期间*/
-	@Excel(name = "考评期间", width = 15)
+	@Excel(name = "考评期间(evaluation period)", width = 15)
     @ApiModelProperty(value = "考评期间")
     private String evaluationPeriod;
 	/**考评等级*/
-	@Excel(name = "考评等级", width = 15)
+	@Excel(name = "考评等级(evaluation level)", width = 15)
     @ApiModelProperty(value = "考评等级")
     private String evaluationLevel;
 	/**备注*/
-	@Excel(name = "备注", width = 15)
+//	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private String notes;
 	/**提交(1-是 ，0-否)*/
-	@Excel(name = "提交(1-是 ，0-否)", width = 15)
+	@Excel(name = "提交(submit)", width = 15)
     @ApiModelProperty(value = "提交(1-是 ，0-否)")
     private Integer submit;
 }

srm-module-code/src/main/java/com/cuidian/srm/cuspCode/entity/CuspSupplierEvaluationScore.java

@@ -49,11 +49,11 @@ public class CuspSupplierEvaluationScore implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+	// @Excel(name = "状态(1-启用,0-停用)", width = 15)
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	// @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -61,39 +61,39 @@ public class CuspSupplierEvaluationScore implements Serializable {
     @ApiModelProperty(value = "主表主键（供应商档案）")
     private String headId;
 	/**价格得分*/
-	@Excel(name = "价格得分", width = 15)
+	// @Excel(name = "价格得分", width = 15)
     @ApiModelProperty(value = "价格得分")
     private Double priceScore;
 	/**质量得分*/
-	@Excel(name = "质量得分", width = 15)
+	// @Excel(name = "质量得分", width = 15)
     @ApiModelProperty(value = "质量得分")
     private Double qualityScore;
 	/**交期得分*/
-	@Excel(name = "交期得分", width = 15)
+	// @Excel(name = "交期得分", width = 15)
     @ApiModelProperty(value = "交期得分")
     private Double deliveryTimeScore;
 	/**服务得分*/
-	@Excel(name = "服务得分", width = 15)
+	// @Excel(name = "服务得分", width = 15)
     @ApiModelProperty(value = "服务得分")
     private Double serviceScore;
 	/**总计得分*/
-	@Excel(name = "总计得分", width = 15)
+	// @Excel(name = "总计得分", width = 15)
     @ApiModelProperty(value = "总计得分")
     private Double totalScore;
 	/**价格自动取数*/
-	@Excel(name = "价格自动取数", width = 15)
+	// @Excel(name = "价格自动取数", width = 15)
     @ApiModelProperty(value = "价格自动取数")
     private String priceAuto;
 	/**质量自动取数*/
-	@Excel(name = "质量自动取数", width = 15)
+	// @Excel(name = "质量自动取数", width = 15)
     @ApiModelProperty(value = "质量自动取数")
     private String qualityAuto;
 	/**交期自动取数*/
-	@Excel(name = "交期自动取数", width = 15)
+	// @Excel(name = "交期自动取数", width = 15)
     @ApiModelProperty(value = "交期自动取数")
     private String deliveryTimeAuto;
 	/**服务自动取数*/
-	@Excel(name = "服务自动取数", width = 15)
+	// @Excel(name = "服务自动取数", width = 15)
     @ApiModelProperty(value = "服务自动取数")
     private String serviceAuto;
 }

srm-module-code/src/main/java/com/cuidian/srm/cuspCode/entity/CuspSupplierProfile.java

@@ -50,112 +50,111 @@ public class CuspSupplierProfile implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+	@Excel(name = "状态(status)", width = 15)
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
 	/**编码*/
-	@Excel(name = "编码", width = 15)
+	@Excel(name = "编码(code)", width = 15)
     @ApiModelProperty(value = "编码")
     private String code;
 	/**名称*/
-	@Excel(name = "名称", width = 15)
+	@Excel(name = "名称(name)", width = 15)
     @ApiModelProperty(value = "名称")
     private String name;
 	/**简称*/
-	@Excel(name = "简称", width = 15)
+	@Excel(name = "简称(abbreviation)", width = 15)
     @ApiModelProperty(value = "简称")
     private String abbreviation;
 	/**曾用名*/
-	@Excel(name = "曾用名", width = 15)
+//	@Excel(name = "曾用名", width = 15)
     @ApiModelProperty(value = "曾用名")
     private String nameUsedBefore;
 	/**税号*/
-	@Excel(name = "税号", width = 15)
+	@Excel(name = "税号(duty paragraph)", width = 15)
     @ApiModelProperty(value = "税号")
     private String dutyParagraph;
 	/**法人*/
-	@Excel(name = "法人", width = 15)
+	@Excel(name = "法人(legal person)", width = 15)
     @ApiModelProperty(value = "法人")
     private String legalPerson;
 	/**联系人*/
-	@Excel(name = "联系人", width = 15)
+	@Excel(name = "联系人(contacts)", width = 15)
     @ApiModelProperty(value = "联系人")
     private String contacts;
 	/**联系电话*/
-	@Excel(name = "联系电话", width = 15)
+	@Excel(name = "联系电话(phone)", width = 15)
     @ApiModelProperty(value = "联系电话")
     private String phone;
 	/**邮箱*/
-	@Excel(name = "邮箱", width = 15)
+//	@Excel(name = "邮箱", width = 15)
     @ApiModelProperty(value = "邮箱")
     private String email;
 	/**注册地址*/
-	@Excel(name = "注册地址", width = 15)
+//	@Excel(name = "注册地址", width = 15)
     @ApiModelProperty(value = "注册地址")
     private String registerAddress;
 	/**公司地址*/
-	@Excel(name = "公司地址", width = 15)
+//	@Excel(name = "公司地址", width = 15)
     @ApiModelProperty(value = "公司地址")
     private String address;
 	/**供应商性质*/
-	@Excel(name = "供应商性质", width = 15)
+	@Excel(name = "供应商性质(supplier nature)", width = 15)
     @ApiModelProperty(value = "供应商性质")
     private String supplierNature;
 	/**国家*/
-	@Excel(name = "国家", width = 15)
+	@Excel(name = "国家(country)", width = 15)
     @ApiModelProperty(value = "国家")
     private String country;
 	/**币种*/
-	@Excel(name = "币种", width = 15)
+//	@Excel(name = "币种", width = 15)
     @ApiModelProperty(value = "币种")
     private String currency;
 	/**国外供应商*/
-	@Excel(name = "国外供应商", width = 15)
+//	@Excel(name = "国外供应商", width = 15)
     @ApiModelProperty(value = "国外供应商")
     private Integer abroadSupplier;
 	/**原厂*/
-	@Excel(name = "原厂", width = 15)
+	@Excel(name = "原厂(original factory)", width = 15)
     @ApiModelProperty(value = "原厂")
     private Integer originalFactory;
 	/**开户行*/
-	@Excel(name = "开户行", width = 15)
+//	@Excel(name = "开户行", width = 15)
     @ApiModelProperty(value = "开户行")
     private String openingBank;
 	/**付款条件*/
-	@Excel(name = "付款条件", width = 15)
+	@Excel(name = "付款条件(payment terms)", width = 15)
     @ApiModelProperty(value = "付款条件")
     private String paymentTerms;
 	/**银行代码*/
-	@Excel(name = "银行代码", width = 15)
+//	@Excel(name = "银行代码", width = 15)
     @ApiModelProperty(value = "银行代码")
     private String swiftCode;
 	/**银行帐号*/
-	@Excel(name = "银行帐号", width = 15)
+//	@Excel(name = "银行帐号", width = 15)
     @ApiModelProperty(value = "银行帐号")
     private String bankAccount;
 	/**营业执照*/
-	@Excel(name = "营业执照", width = 15)
+//	@Excel(name = "营业执照", width = 15)
     @ApiModelProperty(value = "营业执照")
     private String businessLicense;
 	/**其他文件*/
-	@Excel(name = "其他文件", width = 15)
+//	@Excel(name = "其他文件", width = 15)
     @ApiModelProperty(value = "其他文件")
     private String otherFiles;
 	/**备注*/
-	@Excel(name = "备注", width = 15)
+//	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private String notes;
 	/**临时供应商*/
-	@Excel(name = "临时供应商", width = 15)
+	@Excel(name = "临时供应商(Temporary supplier)", width = 15)
     @ApiModelProperty(value = "临时供应商")
     private Integer temporarySupplier;
-	/**供应商等级*/
-	@Excel(name = "供应商等级", width = 15)
+	/**供应商等级*/c
     @ApiModelProperty(value = "供应商等级")
     private String evaluationLevel;
 }

srm-module-code/src/main/java/com/cuidian/srm/cuspCode/entity/CuspSupplierProfileMan.java

@@ -49,11 +49,11 @@ public class CuspSupplierProfileMan implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+	// @Excel(name = "状态(1-启用,0-停用)", width = 15)
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	// @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -61,23 +61,23 @@ public class CuspSupplierProfileMan implements Serializable {
     @ApiModelProperty(value = "主表主键（供应商档案）")
     private String headId;
 	/**编码*/
-	@Excel(name = "编码", width = 15)
+	// @Excel(name = "编码", width = 15)
     @ApiModelProperty(value = "编码")
     private String code;
 	/**姓名*/
-	@Excel(name = "姓名", width = 15)
+	// @Excel(name = "姓名", width = 15)
     @ApiModelProperty(value = "姓名")
     private String name;
 	/**电话*/
-	@Excel(name = "电话", width = 15)
+	// @Excel(name = "电话", width = 15)
     @ApiModelProperty(value = "电话")
     private String mobile;
 	/**邮箱*/
-	@Excel(name = "邮箱", width = 15)
+	// @Excel(name = "邮箱", width = 15)
     @ApiModelProperty(value = "邮箱")
     private String email;
 	/**职位*/
-	@Excel(name = "职位", width = 15)
+	// @Excel(name = "职位", width = 15)
     @ApiModelProperty(value = "职位")
     private String position;
 }

srm-module-code/src/main/java/com/cuidian/srm/cuspCode/entity/CuspSupplierProfileQualification.java

@@ -49,11 +49,11 @@ public class CuspSupplierProfileQualification implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+	//  @Excel(name = "状态(1-启用,0-停用)", width = 15)
     @ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+	//  @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
     @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     @TableLogic
     private Integer delFlag;
@@ -61,31 +61,31 @@ public class CuspSupplierProfileQualification implements Serializable {
     @ApiModelProperty(value = "主表主键（供应商档案）")
     private String headId;
 	/**资质证书名称*/
-	@Excel(name = "资质证书名称", width = 15)
+	//  @Excel(name = "资质证书名称", width = 15)
     @ApiModelProperty(value = "资质证书名称")
     private String qualificationCertificateName;
 	/**资质证书编码*/
-	@Excel(name = "资质证书编码", width = 15)
+	//  @Excel(name = "资质证书编码", width = 15)
     @ApiModelProperty(value = "资质证书编码")
     private String qualificationCertificateCode;
 	/**有效期始*/
-	@Excel(name = "有效期始", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	//  @Excel(name = "有效期始", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "有效期始")
     private Date validBegin;
 	/**有效期止*/
-	@Excel(name = "有效期止", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	//  @Excel(name = "有效期止", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "有效期止")
     private Date validEnd;
 	/**资质证书附件*/
-	@Excel(name = "资质证书附件", width = 15)
+	//  @Excel(name = "资质证书附件", width = 15)
     @ApiModelProperty(value = "资质证书附件")
     private String qualificationCertificate;
 	/**临期提醒*/
-	@Excel(name = "临期提醒", width = 15)
+	//  @Excel(name = "临期提醒", width = 15)
     @ApiModelProperty(value = "临期提醒")
     private Integer deadlineReminder;
 }

srm-module-code/src/main/java/com/cuidian/srm/cuspCode/vo/CuspCustomerProfilePage.java

@@ -46,107 +46,107 @@ public class CuspCustomerProfilePage {
 	@ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+	@Excel(name = "状态(status)", width = 15)
 	@ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     private Integer delFlag;
 	/**编码*/
-	@Excel(name = "编码", width = 15)
+	@Excel(name = "编码(code)", width = 15)
 	@ApiModelProperty(value = "编码")
     private String code;
 	/**名称*/
-	@Excel(name = "名称", width = 15)
+	@Excel(name = "名称(name)", width = 15)
 	@ApiModelProperty(value = "名称")
     private String name;
 	/**简称*/
-	@Excel(name = "简称", width = 15)
+	@Excel(name = "简称(abbreviation)", width = 15)
 	@ApiModelProperty(value = "简称")
     private String abbreviation;
 	/**曾用名*/
-	@Excel(name = "曾用名", width = 15)
+//	@Excel(name = "曾用名", width = 15)
 	@ApiModelProperty(value = "曾用名")
     private String nameUsedBefore;
 	/**税号*/
-	@Excel(name = "税号", width = 15)
+	@Excel(name = "税号(duty paragraph)", width = 15)
 	@ApiModelProperty(value = "税号")
     private String dutyParagraph;
 	/**法人*/
-	@Excel(name = "法人", width = 15)
+	@Excel(name = "法人(legal person)", width = 15)
 	@ApiModelProperty(value = "法人")
     private String legalPerson;
 	/**联系人*/
-	@Excel(name = "联系人", width = 15)
+	@Excel(name = "联系人(contacts)", width = 15)
 	@ApiModelProperty(value = "联系人")
     private String contacts;
 	/**联系电话*/
-	@Excel(name = "联系电话", width = 15)
+	@Excel(name = "联系电话(phone)", width = 15)
 	@ApiModelProperty(value = "联系电话")
     private String phone;
 	/**邮箱*/
-	@Excel(name = "邮箱", width = 15)
+//	@Excel(name = "邮箱", width = 15)
 	@ApiModelProperty(value = "邮箱")
     private String email;
 	/**注册地址*/
-	@Excel(name = "注册地址", width = 15)
+//	@Excel(name = "注册地址", width = 15)
 	@ApiModelProperty(value = "注册地址")
     private String registerAddress;
 	/**办公地址*/
-	@Excel(name = "办公地址", width = 15)
+//	@Excel(name = "办公地址", width = 15)
 	@ApiModelProperty(value = "办公地址")
     private String officeAddress;
 	/**发票地址*/
-	@Excel(name = "发票地址", width = 15)
+//	@Excel(name = "发票地址", width = 15)
 	@ApiModelProperty(value = "发票地址")
     private String invoiceAddress;
 	/**币种*/
-	@Excel(name = "币种", width = 15)
+//	@Excel(name = "币种", width = 15)
 	@ApiModelProperty(value = "币种")
     private String currency;
 	/**国家*/
-	@Excel(name = "国家", width = 15)
+	@Excel(name = "国家(country)", width = 15)
 	@ApiModelProperty(value = "国家")
     private String country;
 	/**付款条件*/
-	@Excel(name = "付款条件", width = 15)
+	@Excel(name = "付款条件(payment terms)", width = 15)
 	@ApiModelProperty(value = "付款条件")
     private String paymentTerms;
 	/**信用额度*/
-	@Excel(name = "信用额度", width = 15)
+	@Excel(name = "信用额度(credit limit)", width = 15)
 	@ApiModelProperty(value = "信用额度")
     private java.math.BigDecimal creditLimit;
 	/**折扣*/
-	@Excel(name = "折扣", width = 15)
+	@Excel(name = "折扣(discount)", width = 15)
 	@ApiModelProperty(value = "折扣")
     private Double discount;
 	/**佣金*/
-	@Excel(name = "佣金", width = 15)
+	@Excel(name = "佣金(commission)", width = 15)
 	@ApiModelProperty(value = "佣金")
     private java.math.BigDecimal commission;
 	/**中间人*/
-	@Excel(name = "中间人", width = 15)
+	@Excel(name = "中间人(intermediator)", width = 15)
 	@ApiModelProperty(value = "中间人")
     private String intermediator;
 	/**中间人佣金*/
-	@Excel(name = "中间人佣金", width = 15)
+	@Excel(name = "中间人佣金(intermediator commission)", width = 15)
 	@ApiModelProperty(value = "中间人佣金")
     private java.math.BigDecimal intermediatorCommission;
 	/**优先级*/
-	@Excel(name = "优先级", width = 15)
+	@Excel(name = "优先级(priority)", width = 15)
 	@ApiModelProperty(value = "优先级")
     private String priority;
 	/**备注*/
-	@Excel(name = "备注", width = 15)
+//	@Excel(name = "备注", width = 15)
 	@ApiModelProperty(value = "备注")
     private String notes;
 	/**文件*/
-	@Excel(name = "文件", width = 15)
+//	@Excel(name = "文件", width = 15)
 	@ApiModelProperty(value = "文件")
     private String files;
 
-	@ExcelCollection(name="客户档案-联系人")
+//	@ExcelCollection(name="客户档案-联系人")
 	@ApiModelProperty(value = "客户档案-联系人")
 	private List<CuspCustomerProfileMan> cuspCustomerProfileManList;
 

srm-module-code/src/main/java/com/cuidian/srm/cuspCode/vo/CuspSupplierEvaluationPage.java

@@ -54,37 +54,37 @@ public class CuspSupplierEvaluationPage {
 	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     private Integer delFlag;
 	/**单据日期*/
-	@Excel(name = "单据日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@Excel(name = "单据日期(bill date)", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "单据日期")
     private Date billDate;
 	/**考评单号*/
-	@Excel(name = "考评单号", width = 15)
+	@Excel(name = "考评单号(bill code)", width = 15)
 	@ApiModelProperty(value = "考评单号")
     private String billCode;
 	/**供应商*/
-	@Excel(name = "供应商", width = 15)
+	@Excel(name = "供应商(supplier)", width = 15)
 	@ApiModelProperty(value = "供应商")
     private Integer supplierId;
 	/**考评期间*/
-	@Excel(name = "考评期间", width = 15)
+	@Excel(name = "考评期间(evaluation period)", width = 15)
 	@ApiModelProperty(value = "考评期间")
     private String evaluationPeriod;
 	/**考评等级*/
-	@Excel(name = "考评等级", width = 15)
+	@Excel(name = "考评等级(evaluation level)", width = 15)
 	@ApiModelProperty(value = "考评等级")
     private String evaluationLevel;
 	/**备注*/
-	@Excel(name = "备注", width = 15)
+//	@Excel(name = "备注", width = 15)
 	@ApiModelProperty(value = "备注")
     private String notes;
 	/**提交(1-是 ，0-否)*/
-	@Excel(name = "提交(1-是 ，0-否)", width = 15)
+	@Excel(name = "提交(submit)", width = 15)
 	@ApiModelProperty(value = "提交(1-是 ，0-否)")
     private Integer submit;
 
-	@ExcelCollection(name="供应商考评-得分")
+//	@ExcelCollection(name="供应商考评-得分")
 	@ApiModelProperty(value = "供应商考评-得分")
 	private List<CuspSupplierEvaluationScore> cuspSupplierEvaluationScoreList;
 

srm-module-code/src/main/java/com/cuidian/srm/cuspCode/vo/CuspSupplierProfilePage.java

@@ -47,107 +47,107 @@ public class CuspSupplierProfilePage {
 	@ApiModelProperty(value = "更新时间")
     private Date updateTime;
 	/**状态(1-启用,0-停用)*/
-	@Excel(name = "状态(1-启用,0-停用)", width = 15)
+	@Excel(name = "状态(status)", width = 15)
 	@ApiModelProperty(value = "状态(1-启用,0-停用)")
     private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+//	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 	@ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
     private Integer delFlag;
 	/**编码*/
-	@Excel(name = "编码", width = 15)
+	@Excel(name = "编码(code)", width = 15)
 	@ApiModelProperty(value = "编码")
     private String code;
 	/**名称*/
-	@Excel(name = "名称", width = 15)
+	@Excel(name = "名称(name)", width = 15)
 	@ApiModelProperty(value = "名称")
     private String name;
 	/**简称*/
-	@Excel(name = "简称", width = 15)
+	@Excel(name = "简称(abbreviation)", width = 15)
 	@ApiModelProperty(value = "简称")
     private String abbreviation;
 	/**曾用名*/
-	@Excel(name = "曾用名", width = 15)
+//	@Excel(name = "曾用名", width = 15)
 	@ApiModelProperty(value = "曾用名")
     private String nameUsedBefore;
 	/**税号*/
-	@Excel(name = "税号", width = 15)
+	@Excel(name = "税号(duty paragraph)", width = 15)
 	@ApiModelProperty(value = "税号")
     private String dutyParagraph;
 	/**法人*/
-	@Excel(name = "法人", width = 15)
+	@Excel(name = "法人(legal person)", width = 15)
 	@ApiModelProperty(value = "法人")
     private String legalPerson;
 	/**联系人*/
-	@Excel(name = "联系人", width = 15)
+	@Excel(name = "联系人(contacts)", width = 15)
 	@ApiModelProperty(value = "联系人")
     private String contacts;
 	/**联系电话*/
-	@Excel(name = "联系电话", width = 15)
+	@Excel(name = "联系电话(phone)", width = 15)
 	@ApiModelProperty(value = "联系电话")
     private String phone;
 	/**邮箱*/
-	@Excel(name = "邮箱", width = 15)
+//	@Excel(name = "邮箱", width = 15)
 	@ApiModelProperty(value = "邮箱")
     private String email;
 	/**注册地址*/
-	@Excel(name = "注册地址", width = 15)
+//	@Excel(name = "注册地址", width = 15)
 	@ApiModelProperty(value = "注册地址")
     private String registerAddress;
 	/**公司地址*/
-	@Excel(name = "公司地址", width = 15)
+//	@Excel(name = "公司地址", width = 15)
 	@ApiModelProperty(value = "公司地址")
     private String address;
 	/**供应商性质*/
-	@Excel(name = "供应商性质", width = 15)
+	@Excel(name = "供应商性质(supplier nature)", width = 15)
 	@ApiModelProperty(value = "供应商性质")
     private String supplierNature;
 	/**国家*/
-	@Excel(name = "国家", width = 15)
+	@Excel(name = "国家(country)", width = 15)
 	@ApiModelProperty(value = "国家")
     private String country;
 	/**币种*/
-	@Excel(name = "币种", width = 15)
+//	@Excel(name = "币种", width = 15)
 	@ApiModelProperty(value = "币种")
     private String currency;
 	/**国外供应商*/
-	@Excel(name = "国外供应商", width = 15)
+//	@Excel(name = "国外供应商", width = 15)
 	@ApiModelProperty(value = "国外供应商")
     private Integer abroadSupplier;
 	/**原厂*/
-	@Excel(name = "原厂", width = 15)
+	@Excel(name = "原厂(original factory)", width = 15)
 	@ApiModelProperty(value = "原厂")
     private Integer originalFactory;
 	/**开户行*/
-	@Excel(name = "开户行", width = 15)
+//	@Excel(name = "开户行", width = 15)
 	@ApiModelProperty(value = "开户行")
     private String openingBank;
 	/**付款条件*/
-	@Excel(name = "付款条件", width = 15)
+	@Excel(name = "付款条件(payment terms)", width = 15)
 	@ApiModelProperty(value = "付款条件")
     private String paymentTerms;
 	/**银行代码*/
-	@Excel(name = "银行代码", width = 15)
+//	@Excel(name = "银行代码", width = 15)
 	@ApiModelProperty(value = "银行代码")
     private String swiftCode;
 	/**银行帐号*/
-	@Excel(name = "银行帐号", width = 15)
+//	@Excel(name = "银行帐号", width = 15)
 	@ApiModelProperty(value = "银行帐号")
     private String bankAccount;
 	/**营业执照*/
-	@Excel(name = "营业执照", width = 15)
+//	@Excel(name = "营业执照", width = 15)
 	@ApiModelProperty(value = "营业执照")
     private String businessLicense;
 	/**其他文件*/
-	@Excel(name = "其他文件", width = 15)
+//	@Excel(name = "其他文件", width = 15)
 	@ApiModelProperty(value = "其他文件")
     private String otherFiles;
 	/**备注*/
-	@Excel(name = "备注", width = 15)
+//	@Excel(name = "备注", width = 15)
 	@ApiModelProperty(value = "备注")
     private String notes;
 	/**临时供应商*/
-	@Excel(name = "临时供应商", width = 15)
+	@Excel(name = "临时供应商(Temporary supplier)", width = 15)
 	@ApiModelProperty(value = "临时供应商")
     private Integer temporarySupplier;
 	/**供应商等级*/