From 901dfe696e8bfdacb974820c4eabf0ec746c7ef3 Mon Sep 17 00:00:00 2001
From: ty <1577900710@qq.com>
Date: Thu, 25 Jul 2024 16:06:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E7=A5=A8=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standardTicket/entity/StandardTicketInfoEntity.java    | 14 +++++++-------
 .../twoTicket/vo/operation/StandardTicketInfoVo.java       | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

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;
 }