From 525c120c93c2c25d8dfc59d4fac234b80b37d1c0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 十二月 2024 09:21:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/model/TTicket.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/model/TTicket.java b/manage/src/main/java/com/jilongda/manage/model/TTicket.java
index 1c27162..eed0ab5 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TTicket.java
+++ b/manage/src/main/java/com/jilongda/manage/model/TTicket.java
@@ -35,7 +35,7 @@
@ApiModelProperty(value = "小票机名称")
@TableField("name")
- private Integer name;
+ private String name;
@ApiModelProperty(value = "类型 1验光单 2加工单")
@TableField("type")
@@ -53,5 +53,9 @@
@TableField("secret")
private String secret;
+ @ApiModelProperty(value = "状态 1=启用 2=禁用")
+ @TableField("status")
+ private Integer status;
+
}
--
Gitblit v1.7.1