~zhangleilei/supipe.git

			@@ -1,6 +1,8 @@
			package com.thhy.materials.modules.biz.embedment.entity;

			import com.fasterxml.jackson.annotation.JsonFormat;
			import com.thhy.general.annotations.Excel;
			import com.thhy.general.annotations.Idkey;
			import lombok.Data;
			import lombok.Getter;
			import lombok.Setter;
			@@ -17,16 +19,25 @@
			/**
			*
			*/
			@Idkey("id")
			private String id;

			/**
			* 预埋件ID
			*/
			private String EmbedmentId;
			private String embedmentId;
			//预埋件名称
			private String EmbedmentName;
			private String embedmentName;
			//预埋件规格
			private String EmbedmentModel;
			@Excel(sort = 1,title = "规格型号")
			private String embedmentModel;

			@Excel(sort = 0,title = "预埋件名称")
			private String embedmentNameAndModel;

			public String getEmbedmentNameAndModel() {
			return embedmentName+"-"+embedmentModel;
			}

			/**
			* 1入库2出库
			@@ -36,6 +47,7 @@
			/**
			* 出库量/入库量
			*/
			@Excel(sort = 2,title = "入库数量")
			private Integer changeStock;

			/**
			@@ -48,16 +60,19 @@
			/**
			* 单价
			*/
			@Excel(sort = 3,title = "单价")
			private BigDecimal singlePrice;

			/**
			* 金额
			*/
			@Excel(sort = 4,title = "金额")
			private BigDecimal amount;

			/**
			* 备注
			*/
			@Excel(sort = 5,title = "备注")
			private String remark;

			/**
			@@ -76,9 +91,11 @@
			/**
			* 入库时间
			*/
			@Excel(sort = 6,title = "入库时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private String createTime;

			private String companyId;
			/**
			* This field was generated by MyBatis Generator.
			* This field corresponds to the database table sys_assist_record
			@@ -86,4 +103,5 @@
			* @mbg.generated Tue Apr 11 09:37:48 CST 2023
			*/
			private static final long serialVersionUID = 1L;

			}