Merge remote-tracking branch 'origin/main'

main
yangzhicheng 12 months ago
commit 7e3b0c8056
  1. 2
      src/main/java/org/energy/modules/smart/entity/OperationTicket.java

@ -5,6 +5,7 @@ import com.dayu.daf.core.mp.base.BaseEntity;
import java.io.Serializable; import java.io.Serializable;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.NullSerializer;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -164,6 +165,7 @@ public class OperationTicket extends BaseEntity {
/** /**
* 是否合格 * 是否合格
*/ */
@JsonSerialize(nullsUsing = NullSerializer.class)
@ApiModelProperty(value = "是否合格") @ApiModelProperty(value = "是否合格")
private Integer isQuakified; private Integer isQuakified;
/** /**

Loading…
Cancel
Save