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; /** * 备注 */