From 1d9a971e6a4ce7863e4b0fce3e251fdfcd83dfcc Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Tue, 14 Apr 2026 11:14:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/springblade/desk/basic/pojo/entity/TeamSet.java | 2 +- .../springblade/desk/basic/controller/WorkCenterController.java | 1 + .../java/org/springblade/desk/basic/excel/TeamSetExcel.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java index 42486725..fad1dd6e 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java @@ -164,7 +164,7 @@ public class TeamSet extends BaseEntity { * 类型-[1]针孔;[2]-壳体;[3]烧结;[4]:园区;[5]:外协; */ @Schema(description = "类型-[1]针孔;[2]-壳体;[3]烧结;[4]:园区;[5]:外协;") - private Short tsType; + private String tsType; /** * 备注 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java index 678f496e..9a76ed7d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java @@ -313,6 +313,7 @@ public class WorkCenterController extends BladeController { QueryWrapper qwcenteam = new QueryWrapper<>(); qwcenteam.eq("WC_ID",detail.getId()); teamCenterService.remove(qwcenteam); + team = ""; } // detail.setTeamId(result); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/TeamSetExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/TeamSetExcel.java index 30d9d7cc..fe1da988 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/TeamSetExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/TeamSetExcel.java @@ -124,7 +124,7 @@ public class TeamSetExcel implements Serializable { */ @ColumnWidth(20) @ExcelProperty("类型;1、针孔,2、壳体,3、烧结,4、园区,5、外协") - private Short tsType; + private String tsType; /** * 备注 */