diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/standardTicket/entity/StandardTicketInfoEntity.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/standardTicket/entity/StandardTicketInfoEntity.java index f17677c..1a2fe67 100644 --- a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/standardTicket/entity/StandardTicketInfoEntity.java +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/standardTicket/entity/StandardTicketInfoEntity.java @@ -179,11 +179,11 @@ public class StandardTicketInfoEntity extends TenantEntity implements Serializab @ApiModelProperty("图片附件") private String picture; -// @ApiModelProperty("设备编号") -// @QueryField(condition = SqlCondition.EQUAL) -// private String emCode ; -// -// @ApiModelProperty("设备名称") -// @QueryField(condition = SqlCondition.LIKE) -// private String emName; + @ApiModelProperty("设备编号") + @QueryField(condition = SqlCondition.EQUAL) + private String emCode ; + + @ApiModelProperty("设备名称") + @QueryField(condition = SqlCondition.LIKE) + private String emName; } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/operation/StandardTicketInfoVo.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/operation/StandardTicketInfoVo.java index fe36451..95a0f76 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/operation/StandardTicketInfoVo.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/vo/operation/StandardTicketInfoVo.java @@ -169,9 +169,9 @@ public class StandardTicketInfoVo extends TenantEntity { @ApiModelProperty("图片附件") private String picture; -// -// @ApiModelProperty("设备编号") -// private String emCode ; -// @ApiModelProperty("设备名称") -// private String emName; + + @ApiModelProperty("设备编号") + private String emCode ; + @ApiModelProperty("设备名称") + private String emName; }