Compare commits

..

No commits in common. 'edbc90b8c02299c0db2699636dcff958756a1def' and '866e75753b01d887d0d656c4a3d6d3dc91a391c2' have entirely different histories.

  1. 4
      lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/ContractDetail.java
  2. 4
      lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java
  3. 11
      lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java
  4. 5
      lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineWay.java

@ -5,7 +5,6 @@ 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;
@ -43,9 +42,6 @@ public class ContractDetail extends BaseEntity implements Serializable {
// 本次到货数量
@TableField(exist = false)
private Integer num;
@TableField(exist = false)
private String brand;
}

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

@ -232,15 +232,4 @@ 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;
}

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