Merge pull request '添加实体类' (#3) from feature_ymf_dev into dev

Reviewed-on: #3

lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/ContractDetail.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.NullSerializer;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
@@ -42,6 +43,9 @@ public class ContractDetail extends BaseEntity implements Serializable {
     // 本次到货数量
     @TableField(exist = false)
     private Integer num;
+    @TableField(exist = false)
+    private String brand;
+
 
 
 }

lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java

@@ -120,6 +120,10 @@ public class Goods extends BaseEntity {
 	@TableField(exist = false)
 	private Integer outNum;
 
+	// 库存数量
+	@TableField(exist = false)
+	private Integer goodsNum;
+
 	// 未到货数量
 	@TableField(exist = false)
 	@JsonSerialize(nullsUsing = NullSerializer.class)

lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java

@@ -232,4 +232,15 @@ public class Examine extends BaseEntity implements Serializable {
 
     // 是否复检
     private Integer isRecheck;
+
+    // 开始时间
+    @TableField(exist = false)
+    private String startTime;
+
+    // 结束
+    @TableField(exist = false)
+    private String endTime;
+
+    @TableField(exist = false)
+    private String testResults;
 }

lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineWay.java

@@ -69,4 +69,9 @@ public class ExamineWay extends BaseEntity implements Serializable {
      */
     private String inputMode;
 
+    /**
+     * 动物种类
+     */
+    private String animalSpecies;
+
 }