ERP_override.git

			@@ -1,6 +1,7 @@
			package com.example.erp.entity.pp;

			import com.baomidou.mybatisplus.annotation.IdType;
			import com.baomidou.mybatisplus.annotation.TableField;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.example.erp.entity.sd.Order;
			import com.example.erp.entity.sd.OrderDetail;
			@@ -55,18 +56,39 @@
			//分架员
			private String founder;
			//分架时间
			@TableField(value = "`splitFrame_time`")
			private LocalDate splitFrameTime;
			//排序
			private Integer sort;
			//建立时间
			private LocalDate createTime;
			//修改时间
			private LocalDate updateTime;

			//查询用
			//报工编号
			@TableField(select = false,exist = false)
			private String reportingWorkId;
			//产品名称
			@TableField(select = false,exist = false)
			private String glassChild;
			//工艺流程
			@TableField(select = false,exist = false)
			private String process;
			//流程卡合并
			@TableField(select = false,exist = false)
			private Integer merge;

			//外键订单表
			@TableField(select = false,exist= false)
			private Order order;
			//外键订单明细表
			@TableField(select = false,exist= false)
			private OrderDetail orderDetail;
			//外键订单工艺审核表
			@TableField(select = false,exist= false)
			private OrderGlassDetail orderGlassDetail;

			@TableField(select = false,exist= false)
			private Product product;
			}