From e013e819f7d544c5c8c59e69ce42c3d10e2215e6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 31 十二月 2024 15:45:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 manage/src/main/java/com/jilongda/manage/model/TTicket.java |    2 +-
 1 files changed, 1 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 3df90ba..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")

--
Gitblit v1.7.1