|
|
@ -4,9 +4,8 @@ import java.io.Serializable; |
|
|
|
import java.io.UnsupportedEncodingException; |
|
|
|
import java.io.UnsupportedEncodingException; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.Date; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import com.baomidou.mybatisplus.annotation.IdType; |
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.annotation.TableId; |
|
|
|
import com.baomidou.mybatisplus.annotation.*; |
|
|
|
import com.baomidou.mybatisplus.annotation.TableName; |
|
|
|
|
|
|
|
import lombok.Data; |
|
|
|
import lombok.Data; |
|
|
|
import com.fasterxml.jackson.annotation.JsonFormat; |
|
|
|
import com.fasterxml.jackson.annotation.JsonFormat; |
|
|
|
import org.springframework.format.annotation.DateTimeFormat; |
|
|
|
import org.springframework.format.annotation.DateTimeFormat; |
|
|
@ -34,118 +33,122 @@ public class ZyFabric implements Serializable { |
|
|
|
/** 材料表*/ |
|
|
|
/** 材料表*/ |
|
|
|
@TableId(type = IdType.ASSIGN_ID) |
|
|
|
@TableId(type = IdType.ASSIGN_ID) |
|
|
|
@ApiModelProperty(value = " 材料表") |
|
|
|
@ApiModelProperty(value = " 材料表") |
|
|
|
private String id; |
|
|
|
private java.lang.String id; |
|
|
|
|
|
|
|
|
|
|
|
/**创建人*/ |
|
|
|
|
|
|
|
@ApiModelProperty(value = "创建人") |
|
|
|
|
|
|
|
private java.lang.String createBy; |
|
|
|
|
|
|
|
/**创建日期*/ |
|
|
|
|
|
|
|
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") |
|
|
|
|
|
|
|
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") |
|
|
|
|
|
|
|
@ApiModelProperty(value = "创建日期") |
|
|
|
|
|
|
|
private java.util.Date createTime; |
|
|
|
|
|
|
|
/**更新人*/ |
|
|
|
|
|
|
|
@ApiModelProperty(value = "更新人") |
|
|
|
|
|
|
|
private java.lang.String updateBy; |
|
|
|
|
|
|
|
/**更新日期*/ |
|
|
|
|
|
|
|
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") |
|
|
|
|
|
|
|
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") |
|
|
|
|
|
|
|
@ApiModelProperty(value = "更新日期") |
|
|
|
|
|
|
|
private java.util.Date updateTime; |
|
|
|
|
|
|
|
/**所属部门*/ |
|
|
|
|
|
|
|
@ApiModelProperty(value = "所属部门") |
|
|
|
|
|
|
|
private java.lang.String sysOrgCode; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**颜色*/ |
|
|
|
/**颜色*/ |
|
|
|
@Excel(name = "颜色", width = 15) |
|
|
|
@Excel(name = "颜色", width = 15) |
|
|
|
@ApiModelProperty(value = "颜色") |
|
|
|
@ApiModelProperty(value = "颜色") |
|
|
|
private String color; |
|
|
|
private java.lang.String color; |
|
|
|
/**花样*/ |
|
|
|
/**花样*/ |
|
|
|
@Excel(name = "花样", width = 15) |
|
|
|
@Excel(name = "花样", width = 15, dictTable = "", dicText = "", dicCode = "pattern") |
|
|
|
|
|
|
|
@Dict(dictTable = "", dicText = "", dicCode = "pattern") |
|
|
|
@ApiModelProperty(value = "花样") |
|
|
|
@ApiModelProperty(value = "花样") |
|
|
|
private String pattern; |
|
|
|
private java.lang.String pattern; |
|
|
|
/**材质*/ |
|
|
|
/**材质*/ |
|
|
|
@Excel(name = "材质", width = 15) |
|
|
|
@Excel(name = "材质", width = 15, dictTable = "", dicText = "", dicCode = "material") |
|
|
|
|
|
|
|
@Dict(dictTable = "", dicText = "", dicCode = "material") |
|
|
|
@ApiModelProperty(value = "材质") |
|
|
|
@ApiModelProperty(value = "材质") |
|
|
|
private String material; |
|
|
|
private java.lang.String material; |
|
|
|
/**描述*/ |
|
|
|
/**描述*/ |
|
|
|
@Excel(name = "描述", width = 15) |
|
|
|
|
|
|
|
@ApiModelProperty(value = "描述") |
|
|
|
@ApiModelProperty(value = "描述") |
|
|
|
private String description; |
|
|
|
private java.lang.String description; |
|
|
|
/**厚度*/ |
|
|
|
/**厚度*/ |
|
|
|
@Excel(name = "厚度", width = 15) |
|
|
|
@Excel(name = "厚度", width = 15, dictTable = "", dicText = "", dicCode = "ply") |
|
|
|
|
|
|
|
@Dict(dictTable = "", dicText = "", dicCode = "ply") |
|
|
|
@ApiModelProperty(value = "厚度") |
|
|
|
@ApiModelProperty(value = "厚度") |
|
|
|
private String ply; |
|
|
|
private java.lang.String ply; |
|
|
|
/**金额*/ |
|
|
|
/**单价*/ |
|
|
|
@Excel(name = "金额", width = 15) |
|
|
|
@Excel(name = "单价", width = 15) |
|
|
|
@ApiModelProperty(value = "金额") |
|
|
|
@ApiModelProperty(value = "单价") |
|
|
|
private Integer money; |
|
|
|
private java.lang.Integer money; |
|
|
|
|
|
|
|
/**图片地址*/ |
|
|
|
|
|
|
|
// @Excel(name = "图片地址", width = 15)
|
|
|
|
@ApiModelProperty(value = "图片地址") |
|
|
|
@ApiModelProperty(value = "图片地址") |
|
|
|
private String imageUrl; |
|
|
|
private java.lang.String imageUrl; |
|
|
|
|
|
|
|
|
|
|
|
/**面料类型id*/ |
|
|
|
/**面料类型id*/ |
|
|
|
@ApiModelProperty(value = "面料类型id") |
|
|
|
@Excel(name = "类型", width = 15 , dictTable = "zy_fabric_type", dicText = "content", dicCode = "id") |
|
|
|
private String typeId; |
|
|
|
@Dict(dictTable = "zy_fabric_type", dicText = "content", dicCode = "id") |
|
|
|
|
|
|
|
@ApiModelProperty(value = "类型") |
|
|
|
|
|
|
|
private java.lang.String typeId; |
|
|
|
|
|
|
|
/**图片地址*/ |
|
|
|
@ApiModelProperty(value = "图片地址") |
|
|
|
@ApiModelProperty(value = "图片地址") |
|
|
|
private String pictureUrl; |
|
|
|
private java.lang.String pictureUrl; |
|
|
|
|
|
|
|
|
|
|
|
/**材料品牌id*/ |
|
|
|
/**材料品牌id*/ |
|
|
|
@Excel(name = "面料品牌id", width = 15) |
|
|
|
@Excel(name = "品牌", width = 15, dictTable = "", dicText = "", dicCode = "brand") |
|
|
|
|
|
|
|
@Dict(dictTable = "", dicText = "", dicCode = "brand") |
|
|
|
@ApiModelProperty(value = "材料品牌id") |
|
|
|
@ApiModelProperty(value = "材料品牌id") |
|
|
|
private String brandId; |
|
|
|
private java.lang.String brandId; |
|
|
|
/**材料编号*/ |
|
|
|
/**材料编号*/ |
|
|
|
@Excel(name = "面料编号", width = 15) |
|
|
|
@Excel(name = "材料编号", width = 15) |
|
|
|
@ApiModelProperty(value = "面料编号") |
|
|
|
@ApiModelProperty(value = "材料编号") |
|
|
|
private String fabricNumber; |
|
|
|
private java.lang.String fabricNumber; |
|
|
|
/**1、为m。2:kg,等*/ |
|
|
|
/**单位 1、为m。2:kg,等*/ |
|
|
|
@Excel(name = "1、为m。2:kg,等", width = 15) |
|
|
|
@Excel(name = "计量单位", width = 15, dictTable = "", dicText = "", dicCode = "unit1") |
|
|
|
|
|
|
|
@Dict(dictTable = "", dicText = "", dicCode = "unit1") |
|
|
|
@ApiModelProperty(value = "1、为m。2:kg,等") |
|
|
|
@ApiModelProperty(value = "1、为m。2:kg,等") |
|
|
|
private Integer unit; |
|
|
|
private java.lang.Integer unit; |
|
|
|
/**零售价*/ |
|
|
|
/**零售价*/ |
|
|
|
@Excel(name = "零售价", width = 15) |
|
|
|
@Excel(name = "零售价", width = 15) |
|
|
|
@ApiModelProperty(value = "零售价") |
|
|
|
@ApiModelProperty(value = "零售价") |
|
|
|
private Integer retailPrice; |
|
|
|
private java.lang.Integer retailPrice; |
|
|
|
/**密度*/ |
|
|
|
/**密度*/ |
|
|
|
@Excel(name = "密度", width = 15) |
|
|
|
@Excel(name = "密度", width = 15, dictTable = "", dicText = "", dicCode = "density") |
|
|
|
|
|
|
|
@Dict(dictTable = "", dicText = "", dicCode = "density") |
|
|
|
@ApiModelProperty(value = "密度") |
|
|
|
@ApiModelProperty(value = "密度") |
|
|
|
private String density; |
|
|
|
private java.lang.String density; |
|
|
|
/**幅宽*/ |
|
|
|
/**幅宽*/ |
|
|
|
@Excel(name = "幅宽", width = 15) |
|
|
|
@Excel(name = "幅宽", width = 15) |
|
|
|
@ApiModelProperty(value = "幅宽") |
|
|
|
@ApiModelProperty(value = "幅宽") |
|
|
|
private String clothW; |
|
|
|
private java.lang.String clothW; |
|
|
|
/**所在地区*/ |
|
|
|
/**所在地区*/ |
|
|
|
@Excel(name = "所在地区", width = 15) |
|
|
|
@Excel(name = "所在地区", width = 15) |
|
|
|
@ApiModelProperty(value = "所在地区") |
|
|
|
@ApiModelProperty(value = "所在地区") |
|
|
|
private String location; |
|
|
|
private java.lang.String location; |
|
|
|
/**状态 o 为下架 1为上架 */ |
|
|
|
/**状态 o 为下架 1为上架 */ |
|
|
|
@Excel(name = "状态 o 为下架 1为上架 ", width = 15) |
|
|
|
@Excel(name = "状态", width = 15, dictTable = "", dicText = "", dicCode = "fabric_status") |
|
|
|
|
|
|
|
@Dict(dictTable = "", dicText = "", dicCode = "fabric_status") |
|
|
|
@ApiModelProperty(value = "状态 o 为下架 1为上架 ") |
|
|
|
@ApiModelProperty(value = "状态 o 为下架 1为上架 ") |
|
|
|
private Integer status; |
|
|
|
private java.lang.Integer status; |
|
|
|
/**二维码*/ |
|
|
|
/**二维码*/ |
|
|
|
@Excel(name = "二维码", width = 15) |
|
|
|
@Excel(name = "二维码", width = 15) |
|
|
|
@ApiModelProperty(value = "二维码") |
|
|
|
@ApiModelProperty(value = "二维码") |
|
|
|
private String qRcode; |
|
|
|
private java.lang.String qRcode; |
|
|
|
/**名称*/ |
|
|
|
/**名称*/ |
|
|
|
@Excel(name = "名称", width = 15) |
|
|
|
@Excel(name = "名称", width = 15) |
|
|
|
@ApiModelProperty(value = "名称") |
|
|
|
@ApiModelProperty(value = "名称") |
|
|
|
private String name; |
|
|
|
private java.lang.String name; |
|
|
|
/**克重*/ |
|
|
|
/**克重*/ |
|
|
|
@Excel(name = "克重", width = 15) |
|
|
|
|
|
|
|
@ApiModelProperty(value = "克重") |
|
|
|
@ApiModelProperty(value = "克重") |
|
|
|
private String gramW; |
|
|
|
private java.lang.String gramW; |
|
|
|
/**面料打理方式*/ |
|
|
|
/**面料打理方式*/ |
|
|
|
@Excel(name = "面料打理方式", width = 15) |
|
|
|
|
|
|
|
@ApiModelProperty(value = "面料打理方式") |
|
|
|
@ApiModelProperty(value = "面料打理方式") |
|
|
|
private String fabricCare; |
|
|
|
private java.lang.String fabricCare; |
|
|
|
/**供货商信息*/ |
|
|
|
/**供货商信息*/ |
|
|
|
@Excel(name = "供货商信息", width = 15) |
|
|
|
@Excel(name = "供货商", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") |
|
|
|
|
|
|
|
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") |
|
|
|
@ApiModelProperty(value = "供货商信息") |
|
|
|
@ApiModelProperty(value = "供货商信息") |
|
|
|
private String supplierInfo; |
|
|
|
private java.lang.String supplierInfo; |
|
|
|
|
|
|
|
/**创建人*/ |
|
|
|
/**二维码*/ |
|
|
|
@ApiModelProperty(value = "创建人") |
|
|
|
|
|
|
|
private java.lang.String createBy; |
|
|
|
@ApiModelProperty(value = "二维码") |
|
|
|
/**创建时间*/ |
|
|
|
private java.lang.String img; |
|
|
|
// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
|
|
|
|
|
|
|
// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
|
|
|
|
|
|
|
@TableField(fill = FieldFill.INSERT) |
|
|
|
|
|
|
|
@ApiModelProperty(value = "创建时间") |
|
|
|
|
|
|
|
private java.lang.String createTime; |
|
|
|
|
|
|
|
/**更新人*/ |
|
|
|
|
|
|
|
@ApiModelProperty(value = "更新人") |
|
|
|
|
|
|
|
private java.lang.String updateBy; |
|
|
|
|
|
|
|
/**更新时间*/ |
|
|
|
|
|
|
|
// @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
|
|
|
|
|
|
|
// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
|
|
|
|
|
|
|
@TableField(fill = FieldFill.INSERT_UPDATE) |
|
|
|
|
|
|
|
@ApiModelProperty(value = "更新时间") |
|
|
|
|
|
|
|
private java.lang.String updateTime; |
|
|
|
|
|
|
|
/**所属部门*/ |
|
|
|
|
|
|
|
@ApiModelProperty(value = "所属部门") |
|
|
|
|
|
|
|
private java.lang.String sysOrgCode; |
|
|
|
} |
|
|
|
} |
|
|
|