productDev/yunyibao.git

			@@ -33,7 +33,7 @@

			@ApiModelProperty(value = "创建时间")
			@ExcelColumn(name="创建时间")
			@JsonFormat(pattern = "yyyy-MM-dd")

			private Date createDate;

			@ApiModelProperty(value = "更新人编码", example = "1")
			@@ -42,7 +42,7 @@

			@ApiModelProperty(value = "更新时间")
			@ExcelColumn(name="更新时间")
			@JsonFormat(pattern = "yyyy-MM-dd")

			private Date editDate;

			@ApiModelProperty(value = "是否删除0否 1是", example = "1")
			@@ -76,8 +76,36 @@
			@ApiModelProperty(value = "基表编码（自关联）", example = "1")
			@ExcelColumn(name="基表编码（自关联）")
			private Integer baseId;
			@ApiModelProperty(value = "委托商户编码（关联company）", example = "1")
			@ExcelColumn(name="委托商户编码（关联company）")
			private Integer shopId;
			@ApiModelProperty(value = "工种集合", example = "1")
			@TableField(exist = false)
			private List<Worktype> worktypeList;
			@ApiModelProperty(value = "LOGO图标", example = "1")
			@ExcelColumn(name="LOGO图标")
			private String logo;

			@ApiModelProperty(value = "LOGO图标", example = "1")
			@TableField(exist = false)
			private String logoFullUrl;

			@ApiModelProperty(value = "英文名称", example = "1")
			@ExcelColumn(name="英文名称")
			private String englishName;
			@ApiModelProperty(value = "联系人", example = "1")
			@ExcelColumn(name="联系人")
			private String linkName;
			@ApiModelProperty(value = "联系人电话", example = "1")
			@ExcelColumn(name="联系人电话")
			private String linkPhone;
			@ApiModelProperty(value = "保险政策", example = "1")
			@ExcelColumn(name="保险政策")
			private String policy;
			@ApiModelProperty(value = "保险条款", example = "1")
			@ExcelColumn(name="保险条款")
			private String agreement;
			@ApiModelProperty(value = "理赔资料", example = "1")
			@ExcelColumn(name="理赔资料")
			private String claimsInformation;
			}