代码生成

src/main/java/org/springblade/modules/workOrder/controller/DeviceAttachController.java

@@ -31,7 +31,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.workOrder.entity.DeviceAttachEntity;
+import org.springblade.modules.workOrder.entity.DeviceAttach;
 import org.springblade.modules.workOrder.vo.DeviceAttachVO;
 import org.springblade.modules.workOrder.excel.DeviceAttachExcel;
 import org.springblade.modules.workOrder.service.IDeviceAttachService;
@@ -64,8 +64,8 @@ public class DeviceAttachController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入deviceAttach")
-	public R<DeviceAttachEntity> detail(DeviceAttachEntity deviceAttach) {
+	public R<DeviceAttach> detail(DeviceAttach deviceAttach) {
-		DeviceAttachEntity detail = deviceAttachService.getOne(Condition.getQueryWrapper(deviceAttach));
+		DeviceAttach detail = deviceAttachService.getOne(Condition.getQueryWrapper(deviceAttach));
 		return R.data(detail);
 	}
 	/**
@@ -74,8 +74,8 @@ public class DeviceAttachController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入deviceAttach")
-	public R<IPage<DeviceAttachEntity>> list(@ApiIgnore @RequestParam Map<String, Object> deviceAttach, Query query) {
+	public R<IPage<DeviceAttach>> list(@ApiIgnore @RequestParam Map<String, Object> deviceAttach, Query query) {
-		IPage<DeviceAttachEntity> pages = deviceAttachService.page(Condition.getPage(query), Condition.getQueryWrapper(deviceAttach, DeviceAttachEntity.class));
+		IPage<DeviceAttach> pages = deviceAttachService.page(Condition.getPage(query), Condition.getQueryWrapper(deviceAttach, DeviceAttach.class));
 		return R.data(pages);
 	}
 
@@ -96,7 +96,7 @@ public class DeviceAttachController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入deviceAttach")
-	public R save(@Valid @RequestBody DeviceAttachEntity deviceAttach) {
+	public R save(@Valid @RequestBody DeviceAttach deviceAttach) {
 		return R.status(deviceAttachService.save(deviceAttach));
 	}
 
@@ -106,7 +106,7 @@ public class DeviceAttachController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入deviceAttach")
-	public R update(@Valid @RequestBody DeviceAttachEntity deviceAttach) {
+	public R update(@Valid @RequestBody DeviceAttach deviceAttach) {
 		return R.status(deviceAttachService.updateById(deviceAttach));
 	}
 
@@ -116,7 +116,7 @@ public class DeviceAttachController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入deviceAttach")
-	public R submit(@Valid @RequestBody DeviceAttachEntity deviceAttach) {
+	public R submit(@Valid @RequestBody DeviceAttach deviceAttach) {
 		return R.status(deviceAttachService.saveOrUpdate(deviceAttach));
 	}
 
@@ -138,11 +138,11 @@ public class DeviceAttachController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入deviceAttach")
 	public void exportDeviceAttach(@ApiIgnore @RequestParam Map<String, Object> deviceAttach, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<DeviceAttachEntity> queryWrapper = Condition.getQueryWrapper(deviceAttach, DeviceAttachEntity.class);
+		QueryWrapper<DeviceAttach> queryWrapper = Condition.getQueryWrapper(deviceAttach, DeviceAttach.class);
 		//if (!AuthUtil.isAdministrator()) {
 		//	queryWrapper.lambda().eq(DeviceAttach::getTenantId, bladeUser.getTenantId());
 		//}
-		queryWrapper.lambda().eq(DeviceAttachEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		queryWrapper.lambda().eq(DeviceAttach::getIsDeleted, BladeConstant.DB_NOT_DELETED);
 		List<DeviceAttachExcel> list = deviceAttachService.exportDeviceAttach(queryWrapper);
 		ExcelUtil.export(response, "设备附件表数据" + DateUtil.time(), "设备附件表数据表", list, DeviceAttachExcel.class);
 	}

src/main/java/org/springblade/modules/workOrder/controller/DeviceController.java

@@ -31,7 +31,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.workOrder.entity.DeviceEntity;
+import org.springblade.modules.workOrder.entity.Device;
 import org.springblade.modules.workOrder.vo.DeviceVO;
 import org.springblade.modules.workOrder.excel.DeviceExcel;
 import org.springblade.modules.workOrder.service.IDeviceService;
@@ -64,8 +64,8 @@ public class DeviceController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入device")
-	public R<DeviceEntity> detail(DeviceEntity device) {
+	public R<Device> detail(Device device) {
-		DeviceEntity detail = deviceService.getOne(Condition.getQueryWrapper(device));
+		Device detail = deviceService.getOne(Condition.getQueryWrapper(device));
 		return R.data(detail);
 	}
 	/**
@@ -74,8 +74,8 @@ public class DeviceController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入device")
-	public R<IPage<DeviceEntity>> list(@ApiIgnore @RequestParam Map<String, Object> device, Query query) {
+	public R<IPage<Device>> list(@ApiIgnore @RequestParam Map<String, Object> device, Query query) {
-		IPage<DeviceEntity> pages = deviceService.page(Condition.getPage(query), Condition.getQueryWrapper(device, DeviceEntity.class));
+		IPage<Device> pages = deviceService.page(Condition.getPage(query), Condition.getQueryWrapper(device, Device.class));
 		return R.data(pages);
 	}
 
@@ -96,7 +96,7 @@ public class DeviceController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入device")
-	public R save(@Valid @RequestBody DeviceEntity device) {
+	public R save(@Valid @RequestBody Device device) {
 		return R.status(deviceService.save(device));
 	}
 
@@ -106,7 +106,7 @@ public class DeviceController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入device")
-	public R update(@Valid @RequestBody DeviceEntity device) {
+	public R update(@Valid @RequestBody Device device) {
 		return R.status(deviceService.updateById(device));
 	}
 
@@ -116,7 +116,7 @@ public class DeviceController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入device")
-	public R submit(@Valid @RequestBody DeviceEntity device) {
+	public R submit(@Valid @RequestBody Device device) {
 		return R.status(deviceService.saveOrUpdate(device));
 	}
 
@@ -138,11 +138,11 @@ public class DeviceController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入device")
 	public void exportDevice(@ApiIgnore @RequestParam Map<String, Object> device, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<DeviceEntity> queryWrapper = Condition.getQueryWrapper(device, DeviceEntity.class);
+		QueryWrapper<Device> queryWrapper = Condition.getQueryWrapper(device, Device.class);
 		//if (!AuthUtil.isAdministrator()) {
 		//	queryWrapper.lambda().eq(Device::getTenantId, bladeUser.getTenantId());
 		//}
-		queryWrapper.lambda().eq(DeviceEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		queryWrapper.lambda().eq(Device::getIsDeleted, BladeConstant.DB_NOT_DELETED);
 		List<DeviceExcel> list = deviceService.exportDevice(queryWrapper);
 		ExcelUtil.export(response, "设备表数据" + DateUtil.time(), "设备表数据表", list, DeviceExcel.class);
 	}

src/main/java/org/springblade/modules/workOrder/controller/FeedbackController.java

@@ -31,7 +31,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.workOrder.entity.FeedbackEntity;
+import org.springblade.modules.workOrder.entity.Feedback;
 import org.springblade.modules.workOrder.vo.FeedbackVO;
 import org.springblade.modules.workOrder.excel.FeedbackExcel;
 import org.springblade.modules.workOrder.service.IFeedbackService;
@@ -64,8 +64,8 @@ public class FeedbackController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入feedback")
-	public R<FeedbackEntity> detail(FeedbackEntity feedback) {
+	public R<Feedback> detail(Feedback feedback) {
-		FeedbackEntity detail = feedbackService.getOne(Condition.getQueryWrapper(feedback));
+		Feedback detail = feedbackService.getOne(Condition.getQueryWrapper(feedback));
 		return R.data(detail);
 	}
 	/**
@@ -74,8 +74,8 @@ public class FeedbackController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入feedback")
-	public R<IPage<FeedbackEntity>> list(@ApiIgnore @RequestParam Map<String, Object> feedback, Query query) {
+	public R<IPage<Feedback>> list(@ApiIgnore @RequestParam Map<String, Object> feedback, Query query) {
-		IPage<FeedbackEntity> pages = feedbackService.page(Condition.getPage(query), Condition.getQueryWrapper(feedback, FeedbackEntity.class));
+		IPage<Feedback> pages = feedbackService.page(Condition.getPage(query), Condition.getQueryWrapper(feedback, Feedback.class));
 		return R.data(pages);
 	}
 
@@ -96,7 +96,7 @@ public class FeedbackController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入feedback")
-	public R save(@Valid @RequestBody FeedbackEntity feedback) {
+	public R save(@Valid @RequestBody Feedback feedback) {
 		return R.status(feedbackService.save(feedback));
 	}
 
@@ -106,7 +106,7 @@ public class FeedbackController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入feedback")
-	public R update(@Valid @RequestBody FeedbackEntity feedback) {
+	public R update(@Valid @RequestBody Feedback feedback) {
 		return R.status(feedbackService.updateById(feedback));
 	}
 
@@ -116,7 +116,7 @@ public class FeedbackController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入feedback")
-	public R submit(@Valid @RequestBody FeedbackEntity feedback) {
+	public R submit(@Valid @RequestBody Feedback feedback) {
 		return R.status(feedbackService.saveOrUpdate(feedback));
 	}
 
@@ -138,11 +138,11 @@ public class FeedbackController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入feedback")
 	public void exportFeedback(@ApiIgnore @RequestParam Map<String, Object> feedback, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<FeedbackEntity> queryWrapper = Condition.getQueryWrapper(feedback, FeedbackEntity.class);
+		QueryWrapper<Feedback> queryWrapper = Condition.getQueryWrapper(feedback, Feedback.class);
 		//if (!AuthUtil.isAdministrator()) {
 		//	queryWrapper.lambda().eq(Feedback::getTenantId, bladeUser.getTenantId());
 		//}
-		queryWrapper.lambda().eq(FeedbackEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		queryWrapper.lambda().eq(Feedback::getIsDeleted, BladeConstant.DB_NOT_DELETED);
 		List<FeedbackExcel> list = feedbackService.exportFeedback(queryWrapper);
 		ExcelUtil.export(response, "意见反馈表数据" + DateUtil.time(), "意见反馈表数据表", list, FeedbackExcel.class);
 	}

src/main/java/org/springblade/modules/workOrder/controller/InformationAttachController.java

@@ -31,7 +31,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.workOrder.entity.InformationAttachEntity;
+import org.springblade.modules.workOrder.entity.InformationAttach;
 import org.springblade.modules.workOrder.vo.InformationAttachVO;
 import org.springblade.modules.workOrder.excel.InformationAttachExcel;
 import org.springblade.modules.workOrder.service.IInformationAttachService;
@@ -64,8 +64,8 @@ public class InformationAttachController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入informationAttach")
-	public R<InformationAttachEntity> detail(InformationAttachEntity informationAttach) {
+	public R<InformationAttach> detail(InformationAttach informationAttach) {
-		InformationAttachEntity detail = informationAttachService.getOne(Condition.getQueryWrapper(informationAttach));
+		InformationAttach detail = informationAttachService.getOne(Condition.getQueryWrapper(informationAttach));
 		return R.data(detail);
 	}
 	/**
@@ -74,8 +74,8 @@ public class InformationAttachController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入informationAttach")
-	public R<IPage<InformationAttachEntity>> list(@ApiIgnore @RequestParam Map<String, Object> informationAttach, Query query) {
+	public R<IPage<InformationAttach>> list(@ApiIgnore @RequestParam Map<String, Object> informationAttach, Query query) {
-		IPage<InformationAttachEntity> pages = informationAttachService.page(Condition.getPage(query), Condition.getQueryWrapper(informationAttach, InformationAttachEntity.class));
+		IPage<InformationAttach> pages = informationAttachService.page(Condition.getPage(query), Condition.getQueryWrapper(informationAttach, InformationAttach.class));
 		return R.data(pages);
 	}
 
@@ -96,7 +96,7 @@ public class InformationAttachController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入informationAttach")
-	public R save(@Valid @RequestBody InformationAttachEntity informationAttach) {
+	public R save(@Valid @RequestBody InformationAttach informationAttach) {
 		return R.status(informationAttachService.save(informationAttach));
 	}
 
@@ -106,7 +106,7 @@ public class InformationAttachController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入informationAttach")
-	public R update(@Valid @RequestBody InformationAttachEntity informationAttach) {
+	public R update(@Valid @RequestBody InformationAttach informationAttach) {
 		return R.status(informationAttachService.updateById(informationAttach));
 	}
 
@@ -116,7 +116,7 @@ public class InformationAttachController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入informationAttach")
-	public R submit(@Valid @RequestBody InformationAttachEntity informationAttach) {
+	public R submit(@Valid @RequestBody InformationAttach informationAttach) {
 		return R.status(informationAttachService.saveOrUpdate(informationAttach));
 	}
 
@@ -138,11 +138,11 @@ public class InformationAttachController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入informationAttach")
 	public void exportInformationAttach(@ApiIgnore @RequestParam Map<String, Object> informationAttach, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<InformationAttachEntity> queryWrapper = Condition.getQueryWrapper(informationAttach, InformationAttachEntity.class);
+		QueryWrapper<InformationAttach> queryWrapper = Condition.getQueryWrapper(informationAttach, InformationAttach.class);
 		//if (!AuthUtil.isAdministrator()) {
 		//	queryWrapper.lambda().eq(InformationAttach::getTenantId, bladeUser.getTenantId());
 		//}
-		queryWrapper.lambda().eq(InformationAttachEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		queryWrapper.lambda().eq(InformationAttach::getIsDeleted, BladeConstant.DB_NOT_DELETED);
 		List<InformationAttachExcel> list = informationAttachService.exportInformationAttach(queryWrapper);
 		ExcelUtil.export(response, "资料附件表数据" + DateUtil.time(), "资料附件表数据表", list, InformationAttachExcel.class);
 	}

src/main/java/org/springblade/modules/workOrder/controller/InformationController.java

@@ -31,7 +31,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.workOrder.entity.InformationEntity;
+import org.springblade.modules.workOrder.entity.Information;
 import org.springblade.modules.workOrder.vo.InformationVO;
 import org.springblade.modules.workOrder.excel.InformationExcel;
 import org.springblade.modules.workOrder.service.IInformationService;
@@ -64,8 +64,8 @@ public class InformationController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入information")
-	public R<InformationEntity> detail(InformationEntity information) {
+	public R<Information> detail(Information information) {
-		InformationEntity detail = informationService.getOne(Condition.getQueryWrapper(information));
+		Information detail = informationService.getOne(Condition.getQueryWrapper(information));
 		return R.data(detail);
 	}
 	/**
@@ -74,8 +74,8 @@ public class InformationController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入information")
-	public R<IPage<InformationEntity>> list(@ApiIgnore @RequestParam Map<String, Object> information, Query query) {
+	public R<IPage<Information>> list(@ApiIgnore @RequestParam Map<String, Object> information, Query query) {
-		IPage<InformationEntity> pages = informationService.page(Condition.getPage(query), Condition.getQueryWrapper(information, InformationEntity.class));
+		IPage<Information> pages = informationService.page(Condition.getPage(query), Condition.getQueryWrapper(information, Information.class));
 		return R.data(pages);
 	}
 
@@ -96,7 +96,7 @@ public class InformationController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入information")
-	public R save(@Valid @RequestBody InformationEntity information) {
+	public R save(@Valid @RequestBody Information information) {
 		return R.status(informationService.save(information));
 	}
 
@@ -106,7 +106,7 @@ public class InformationController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入information")
-	public R update(@Valid @RequestBody InformationEntity information) {
+	public R update(@Valid @RequestBody Information information) {
 		return R.status(informationService.updateById(information));
 	}
 
@@ -116,7 +116,7 @@ public class InformationController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入information")
-	public R submit(@Valid @RequestBody InformationEntity information) {
+	public R submit(@Valid @RequestBody Information information) {
 		return R.status(informationService.saveOrUpdate(information));
 	}
 
@@ -138,11 +138,11 @@ public class InformationController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入information")
 	public void exportInformation(@ApiIgnore @RequestParam Map<String, Object> information, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<InformationEntity> queryWrapper = Condition.getQueryWrapper(information, InformationEntity.class);
+		QueryWrapper<Information> queryWrapper = Condition.getQueryWrapper(information, Information.class);
 		//if (!AuthUtil.isAdministrator()) {
 		//	queryWrapper.lambda().eq(Information::getTenantId, bladeUser.getTenantId());
 		//}
-		queryWrapper.lambda().eq(InformationEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		queryWrapper.lambda().eq(Information::getIsDeleted, BladeConstant.DB_NOT_DELETED);
 		List<InformationExcel> list = informationService.exportInformation(queryWrapper);
 		ExcelUtil.export(response, "资料表数据" + DateUtil.time(), "资料表数据表", list, InformationExcel.class);
 	}

src/main/java/org/springblade/modules/workOrder/controller/WorkOrderAttachController.java

@@ -31,7 +31,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.workOrder.entity.WorkOrderAttachEntity;
+import org.springblade.modules.workOrder.entity.WorkOrderAttach;
 import org.springblade.modules.workOrder.vo.WorkOrderAttachVO;
 import org.springblade.modules.workOrder.excel.WorkOrderAttachExcel;
 import org.springblade.modules.workOrder.service.IWorkOrderAttachService;
@@ -64,8 +64,8 @@ public class WorkOrderAttachController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入workOrderAttach")
-	public R<WorkOrderAttachEntity> detail(WorkOrderAttachEntity workOrderAttach) {
+	public R<WorkOrderAttach> detail(WorkOrderAttach workOrderAttach) {
-		WorkOrderAttachEntity detail = workOrderAttachService.getOne(Condition.getQueryWrapper(workOrderAttach));
+		WorkOrderAttach detail = workOrderAttachService.getOne(Condition.getQueryWrapper(workOrderAttach));
 		return R.data(detail);
 	}
 	/**
@@ -74,8 +74,8 @@ public class WorkOrderAttachController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入workOrderAttach")
-	public R<IPage<WorkOrderAttachEntity>> list(@ApiIgnore @RequestParam Map<String, Object> workOrderAttach, Query query) {
+	public R<IPage<WorkOrderAttach>> list(@ApiIgnore @RequestParam Map<String, Object> workOrderAttach, Query query) {
-		IPage<WorkOrderAttachEntity> pages = workOrderAttachService.page(Condition.getPage(query), Condition.getQueryWrapper(workOrderAttach, WorkOrderAttachEntity.class));
+		IPage<WorkOrderAttach> pages = workOrderAttachService.page(Condition.getPage(query), Condition.getQueryWrapper(workOrderAttach, WorkOrderAttach.class));
 		return R.data(pages);
 	}
 
@@ -96,7 +96,7 @@ public class WorkOrderAttachController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入workOrderAttach")
-	public R save(@Valid @RequestBody WorkOrderAttachEntity workOrderAttach) {
+	public R save(@Valid @RequestBody WorkOrderAttach workOrderAttach) {
 		return R.status(workOrderAttachService.save(workOrderAttach));
 	}
 
@@ -106,7 +106,7 @@ public class WorkOrderAttachController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入workOrderAttach")
-	public R update(@Valid @RequestBody WorkOrderAttachEntity workOrderAttach) {
+	public R update(@Valid @RequestBody WorkOrderAttach workOrderAttach) {
 		return R.status(workOrderAttachService.updateById(workOrderAttach));
 	}
 
@@ -116,7 +116,7 @@ public class WorkOrderAttachController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入workOrderAttach")
-	public R submit(@Valid @RequestBody WorkOrderAttachEntity workOrderAttach) {
+	public R submit(@Valid @RequestBody WorkOrderAttach workOrderAttach) {
 		return R.status(workOrderAttachService.saveOrUpdate(workOrderAttach));
 	}
 
@@ -138,11 +138,11 @@ public class WorkOrderAttachController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入workOrderAttach")
 	public void exportWorkOrderAttach(@ApiIgnore @RequestParam Map<String, Object> workOrderAttach, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<WorkOrderAttachEntity> queryWrapper = Condition.getQueryWrapper(workOrderAttach, WorkOrderAttachEntity.class);
+		QueryWrapper<WorkOrderAttach> queryWrapper = Condition.getQueryWrapper(workOrderAttach, WorkOrderAttach.class);
 		//if (!AuthUtil.isAdministrator()) {
 		//	queryWrapper.lambda().eq(WorkOrderAttach::getTenantId, bladeUser.getTenantId());
 		//}
-		queryWrapper.lambda().eq(WorkOrderAttachEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		queryWrapper.lambda().eq(WorkOrderAttach::getIsDeleted, BladeConstant.DB_NOT_DELETED);
 		List<WorkOrderAttachExcel> list = workOrderAttachService.exportWorkOrderAttach(queryWrapper);
 		ExcelUtil.export(response, "工单附件表数据" + DateUtil.time(), "工单附件表数据表", list, WorkOrderAttachExcel.class);
 	}

src/main/java/org/springblade/modules/workOrder/controller/WorkOrderController.java

@@ -31,7 +31,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.workOrder.entity.WorkOrderEntity;
+import org.springblade.modules.workOrder.entity.WorkOrder;
 import org.springblade.modules.workOrder.vo.WorkOrderVO;
 import org.springblade.modules.workOrder.excel.WorkOrderExcel;
 import org.springblade.modules.workOrder.service.IWorkOrderService;
@@ -64,8 +64,8 @@ public class WorkOrderController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入workOrder")
-	public R<WorkOrderEntity> detail(WorkOrderEntity workOrder) {
+	public R<WorkOrder> detail(WorkOrder workOrder) {
-		WorkOrderEntity detail = workOrderService.getOne(Condition.getQueryWrapper(workOrder));
+		WorkOrder detail = workOrderService.getOne(Condition.getQueryWrapper(workOrder));
 		return R.data(detail);
 	}
 	/**
@@ -74,8 +74,8 @@ public class WorkOrderController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入workOrder")
-	public R<IPage<WorkOrderEntity>> list(@ApiIgnore @RequestParam Map<String, Object> workOrder, Query query) {
+	public R<IPage<WorkOrder>> list(@ApiIgnore @RequestParam Map<String, Object> workOrder, Query query) {
-		IPage<WorkOrderEntity> pages = workOrderService.page(Condition.getPage(query), Condition.getQueryWrapper(workOrder, WorkOrderEntity.class));
+		IPage<WorkOrder> pages = workOrderService.page(Condition.getPage(query), Condition.getQueryWrapper(workOrder, WorkOrder.class));
 		return R.data(pages);
 	}
 
@@ -96,7 +96,7 @@ public class WorkOrderController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入workOrder")
-	public R save(@Valid @RequestBody WorkOrderEntity workOrder) {
+	public R save(@Valid @RequestBody WorkOrder workOrder) {
 		return R.status(workOrderService.save(workOrder));
 	}
 
@@ -106,7 +106,7 @@ public class WorkOrderController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入workOrder")
-	public R update(@Valid @RequestBody WorkOrderEntity workOrder) {
+	public R update(@Valid @RequestBody WorkOrder workOrder) {
 		return R.status(workOrderService.updateById(workOrder));
 	}
 
@@ -116,7 +116,7 @@ public class WorkOrderController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入workOrder")
-	public R submit(@Valid @RequestBody WorkOrderEntity workOrder) {
+	public R submit(@Valid @RequestBody WorkOrder workOrder) {
 		return R.status(workOrderService.saveOrUpdate(workOrder));
 	}
 
@@ -138,11 +138,11 @@ public class WorkOrderController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入workOrder")
 	public void exportWorkOrder(@ApiIgnore @RequestParam Map<String, Object> workOrder, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<WorkOrderEntity> queryWrapper = Condition.getQueryWrapper(workOrder, WorkOrderEntity.class);
+		QueryWrapper<WorkOrder> queryWrapper = Condition.getQueryWrapper(workOrder, WorkOrder.class);
 		//if (!AuthUtil.isAdministrator()) {
 		//	queryWrapper.lambda().eq(WorkOrder::getTenantId, bladeUser.getTenantId());
 		//}
-		queryWrapper.lambda().eq(WorkOrderEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		queryWrapper.lambda().eq(WorkOrder::getIsDeleted, BladeConstant.DB_NOT_DELETED);
 		List<WorkOrderExcel> list = workOrderService.exportWorkOrder(queryWrapper);
 		ExcelUtil.export(response, "工单表数据" + DateUtil.time(), "工单表数据表", list, WorkOrderExcel.class);
 	}

src/main/java/org/springblade/modules/workOrder/controller/WorkOrderRepairMaterialController.java

@@ -31,7 +31,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.modules.workOrder.entity.WorkOrderRepairMaterialEntity;
+import org.springblade.modules.workOrder.entity.WorkOrderRepairMaterial;
 import org.springblade.modules.workOrder.vo.WorkOrderRepairMaterialVO;
 import org.springblade.modules.workOrder.excel.WorkOrderRepairMaterialExcel;
 import org.springblade.modules.workOrder.service.IWorkOrderRepairMaterialService;
@@ -64,8 +64,8 @@ public class WorkOrderRepairMaterialController extends BladeController {
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入workOrderRepairMaterial")
-	public R<WorkOrderRepairMaterialEntity> detail(WorkOrderRepairMaterialEntity workOrderRepairMaterial) {
+	public R<WorkOrderRepairMaterial> detail(WorkOrderRepairMaterial workOrderRepairMaterial) {
-		WorkOrderRepairMaterialEntity detail = workOrderRepairMaterialService.getOne(Condition.getQueryWrapper(workOrderRepairMaterial));
+		WorkOrderRepairMaterial detail = workOrderRepairMaterialService.getOne(Condition.getQueryWrapper(workOrderRepairMaterial));
 		return R.data(detail);
 	}
 	/**
@@ -74,8 +74,8 @@ public class WorkOrderRepairMaterialController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入workOrderRepairMaterial")
-	public R<IPage<WorkOrderRepairMaterialEntity>> list(@ApiIgnore @RequestParam Map<String, Object> workOrderRepairMaterial, Query query) {
+	public R<IPage<WorkOrderRepairMaterial>> list(@ApiIgnore @RequestParam Map<String, Object> workOrderRepairMaterial, Query query) {
-		IPage<WorkOrderRepairMaterialEntity> pages = workOrderRepairMaterialService.page(Condition.getPage(query), Condition.getQueryWrapper(workOrderRepairMaterial, WorkOrderRepairMaterialEntity.class));
+		IPage<WorkOrderRepairMaterial> pages = workOrderRepairMaterialService.page(Condition.getPage(query), Condition.getQueryWrapper(workOrderRepairMaterial, WorkOrderRepairMaterial.class));
 		return R.data(pages);
 	}
 
@@ -96,7 +96,7 @@ public class WorkOrderRepairMaterialController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入workOrderRepairMaterial")
-	public R save(@Valid @RequestBody WorkOrderRepairMaterialEntity workOrderRepairMaterial) {
+	public R save(@Valid @RequestBody WorkOrderRepairMaterial workOrderRepairMaterial) {
 		return R.status(workOrderRepairMaterialService.save(workOrderRepairMaterial));
 	}
 
@@ -106,7 +106,7 @@ public class WorkOrderRepairMaterialController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入workOrderRepairMaterial")
-	public R update(@Valid @RequestBody WorkOrderRepairMaterialEntity workOrderRepairMaterial) {
+	public R update(@Valid @RequestBody WorkOrderRepairMaterial workOrderRepairMaterial) {
 		return R.status(workOrderRepairMaterialService.updateById(workOrderRepairMaterial));
 	}
 
@@ -116,7 +116,7 @@ public class WorkOrderRepairMaterialController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入workOrderRepairMaterial")
-	public R submit(@Valid @RequestBody WorkOrderRepairMaterialEntity workOrderRepairMaterial) {
+	public R submit(@Valid @RequestBody WorkOrderRepairMaterial workOrderRepairMaterial) {
 		return R.status(workOrderRepairMaterialService.saveOrUpdate(workOrderRepairMaterial));
 	}
 
@@ -138,11 +138,11 @@ public class WorkOrderRepairMaterialController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入workOrderRepairMaterial")
 	public void exportWorkOrderRepairMaterial(@ApiIgnore @RequestParam Map<String, Object> workOrderRepairMaterial, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<WorkOrderRepairMaterialEntity> queryWrapper = Condition.getQueryWrapper(workOrderRepairMaterial, WorkOrderRepairMaterialEntity.class);
+		QueryWrapper<WorkOrderRepairMaterial> queryWrapper = Condition.getQueryWrapper(workOrderRepairMaterial, WorkOrderRepairMaterial.class);
 		//if (!AuthUtil.isAdministrator()) {
 		//	queryWrapper.lambda().eq(WorkOrderRepairMaterial::getTenantId, bladeUser.getTenantId());
 		//}
-		queryWrapper.lambda().eq(WorkOrderRepairMaterialEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		queryWrapper.lambda().eq(WorkOrderRepairMaterial::getIsDeleted, BladeConstant.DB_NOT_DELETED);
 		List<WorkOrderRepairMaterialExcel> list = workOrderRepairMaterialService.exportWorkOrderRepairMaterial(queryWrapper);
 		ExcelUtil.export(response, "工单维修材料表数据" + DateUtil.time(), "工单维修材料表数据表", list, WorkOrderRepairMaterialExcel.class);
 	}

src/main/java/org/springblade/modules/workOrder/dto/DeviceAttachDTO.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.dto;
 
-import org.springblade.modules.workOrder.entity.DeviceAttachEntity;
+import org.springblade.modules.workOrder.entity.DeviceAttach;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -28,7 +28,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class DeviceAttachDTO extends DeviceAttachEntity {
+public class DeviceAttachDTO extends DeviceAttach {
 	private static final long serialVersionUID = 1L;
 
 }

src/main/java/org/springblade/modules/workOrder/dto/DeviceDTO.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.dto;
 
-import org.springblade.modules.workOrder.entity.DeviceEntity;
+import org.springblade.modules.workOrder.entity.Device;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -28,7 +28,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class DeviceDTO extends DeviceEntity {
+public class DeviceDTO extends Device {
 	private static final long serialVersionUID = 1L;
 
 }

src/main/java/org/springblade/modules/workOrder/dto/FeedbackDTO.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.dto;
 
-import org.springblade.modules.workOrder.entity.FeedbackEntity;
+import org.springblade.modules.workOrder.entity.Feedback;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -28,7 +28,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class FeedbackDTO extends FeedbackEntity {
+public class FeedbackDTO extends Feedback {
 	private static final long serialVersionUID = 1L;
 
 }

src/main/java/org/springblade/modules/workOrder/dto/InformationAttachDTO.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.dto;
 
-import org.springblade.modules.workOrder.entity.InformationAttachEntity;
+import org.springblade.modules.workOrder.entity.InformationAttach;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -28,7 +28,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class InformationAttachDTO extends InformationAttachEntity {
+public class InformationAttachDTO extends InformationAttach {
 	private static final long serialVersionUID = 1L;
 
 }

src/main/java/org/springblade/modules/workOrder/dto/InformationDTO.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.dto;
 
-import org.springblade.modules.workOrder.entity.InformationEntity;
+import org.springblade.modules.workOrder.entity.Information;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -28,7 +28,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class InformationDTO extends InformationEntity {
+public class InformationDTO extends Information {
 	private static final long serialVersionUID = 1L;
 
 }

src/main/java/org/springblade/modules/workOrder/dto/WorkOrderAttachDTO.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.dto;
 
-import org.springblade.modules.workOrder.entity.WorkOrderAttachEntity;
+import org.springblade.modules.workOrder.entity.WorkOrderAttach;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -28,7 +28,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class WorkOrderAttachDTO extends WorkOrderAttachEntity {
+public class WorkOrderAttachDTO extends WorkOrderAttach {
 	private static final long serialVersionUID = 1L;
 
 }

src/main/java/org/springblade/modules/workOrder/dto/WorkOrderDTO.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.dto;
 
-import org.springblade.modules.workOrder.entity.WorkOrderEntity;
+import org.springblade.modules.workOrder.entity.WorkOrder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -28,7 +28,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class WorkOrderDTO extends WorkOrderEntity {
+public class WorkOrderDTO extends WorkOrder {
 	private static final long serialVersionUID = 1L;
 
 }

src/main/java/org/springblade/modules/workOrder/dto/WorkOrderRepairMaterialDTO.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.dto;
 
-import org.springblade.modules.workOrder.entity.WorkOrderRepairMaterialEntity;
+import org.springblade.modules.workOrder.entity.WorkOrderRepairMaterial;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -28,7 +28,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class WorkOrderRepairMaterialDTO extends WorkOrderRepairMaterialEntity {
+public class WorkOrderRepairMaterialDTO extends WorkOrderRepairMaterial {
 	private static final long serialVersionUID = 1L;
 
 }

src/main/java/org/springblade/modules/workOrder/entity/Device.java

@@ -0,0 +1,67 @@
+package org.springblade.modules.workOrder.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 设备表 实体类
+ *
+ * @author BladeX
+ * @since 2024-10-14
+ */
+@Data
+@TableName("busin_device")
+@ApiModel(value = "Device对象", description = "设备表")
+@EqualsAndHashCode(callSuper = true)
+public class Device extends BaseEntity {
+
+	/**
+	 * 设备编号
+	 */
+	private String code;
+
+	/**
+	 * 设备名称
+	 */
+	private String name;
+
+	/**
+	 * 设备型号
+	 */
+	private String model;
+
+	/**
+	 * 设备类型
+	 */
+	private String type;
+
+	/**
+	 * 设备位置
+	 */
+	private String position;
+
+	/**
+	 * 供应商
+	 */
+	private String supplier;
+
+	/**
+	 * 生产时间
+	 */
+	private Date produceTime;
+
+	/**
+	 * 附件名称
+	 */
+	private String attachName;
+
+	/**
+	 * 运行状态（ 0关机 1运行中 2报警中）
+	 */
+	private Integer runStatus;
+}

src/main/java/org/springblade/modules/workOrder/entity/DeviceAttach.java

@@ -16,7 +16,36 @@ import org.springblade.core.mp.base.BaseEntity;
 @TableName("busin_device_attach")
 @ApiModel(value = "DeviceAttach对象", description = "设备附件表")
 @EqualsAndHashCode(callSuper = true)
-public class DeviceAttachEntity extends BaseEntity {
+public class DeviceAttach extends BaseEntity {
 
+	/**
+	 * 工单id
+	 */
+	private Long deviceId;
+
+	/**
+	 * 附件地址
+	 */
+	private String link;
+
+	/**
+	 * 附件名称
+	 */
+	private String name;
+
+	/**
+	 * 附件原名
+	 */
+	private String originalName;
+
+	/**
+	 * 附件拓展名
+	 */
+	private String extension;
+
+	/**
+	 * 附件大小
+	 */
+	private Long attachSize;
 
 }

src/main/java/org/springblade/modules/workOrder/entity/DeviceEntity.java

@@ -1,22 +0,0 @@
-package org.springblade.modules.workOrder.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
-
-/**
- * 设备表 实体类
- *
- * @author BladeX
- * @since 2024-10-14
- */
-@Data
-@TableName("busin_device")
-@ApiModel(value = "Device对象", description = "设备表")
-@EqualsAndHashCode(callSuper = true)
-public class DeviceEntity extends BaseEntity {
-
-
-}

src/main/java/org/springblade/modules/workOrder/entity/Feedback.java

@@ -16,7 +16,35 @@ import org.springblade.core.mp.base.BaseEntity;
 @TableName("busin_feedback")
 @ApiModel(value = "Feedback对象", description = "意见反馈表")
 @EqualsAndHashCode(callSuper = true)
-public class FeedbackEntity extends BaseEntity {
+public class Feedback extends BaseEntity {
 
+	/**
+	 * 意见编号
+	 */
+	private String code;
 
+	/**
+	 * 意见描述
+	 */
+	private String describe;
+
+	/**
+	 * 联系人
+	 */
+	private String contacts;
+
+	/**
+	 * 联系电话
+	 */
+	private String phone;
+
+	/**
+	 * 反馈类型
+	 */
+	private Integer type;
+
+	/**
+	 * 反馈内容
+	 */
+	private String content;
 }

src/main/java/org/springblade/modules/workOrder/entity/Information.java

@@ -16,7 +16,15 @@ import org.springblade.core.mp.base.BaseEntity;
 @TableName("busin_information")
 @ApiModel(value = "Information对象", description = "资料表")
 @EqualsAndHashCode(callSuper = true)
-public class InformationEntity extends BaseEntity {
+public class Information extends BaseEntity {
 
+	/**
+	 * 资料名称
+	 */
+	private String name;
 
+	/**
+	 * 资料类型（1图纸 2技术资料）
+	 */
+	private Integer type;
 }

src/main/java/org/springblade/modules/workOrder/entity/InformationAttach.java

@@ -16,7 +16,35 @@ import org.springblade.core.mp.base.BaseEntity;
 @TableName("busin_information_attach")
 @ApiModel(value = "InformationAttach对象", description = "资料附件表")
 @EqualsAndHashCode(callSuper = true)
-public class InformationAttachEntity extends BaseEntity {
+public class InformationAttach extends BaseEntity {
 
+	/**
+	 * 工单id
+	 */
+	private Long informationId;
 
+	/**
+	 * 附件地址
+	 */
+	private String link;
+
+	/**
+	 * 附件名称
+	 */
+	private String name;
+
+	/**
+	 * 附件原名
+	 */
+	private String originalName;
+
+	/**
+	 * 附件拓展名
+	 */
+	private String extension;
+
+	/**
+	 * 附件大小
+	 */
+	private Long attachSize;
 }

src/main/java/org/springblade/modules/workOrder/entity/WorkOrder.java

@@ -0,0 +1,162 @@
+package org.springblade.modules.workOrder.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 工单表 实体类
+ *
+ * @author BladeX
+ * @since 2024-10-14
+ */
+@Data
+@TableName("busin_work_order")
+@ApiModel(value = "WorkOrder对象", description = "工单表")
+@EqualsAndHashCode(callSuper = true)
+public class WorkOrder extends BaseEntity {
+
+	/**
+	 * 故障位置
+	 */
+	private String faultLocation;
+
+	/**
+	 * 设备名称
+	 */
+	private String deviceName;
+
+	/**
+	 * 故障类型
+	 */
+	private String faultType;
+
+	/**
+	 * 故障描述
+	 */
+	private String faultDescribe;
+
+	/**
+	 * 填报人
+	 */
+	private Long informant;
+
+	/**
+	 * 填报人电话
+	 */
+	private String informantPhone;
+
+	/**
+	 * 填报时间
+	 */
+	private Date fillingTime;
+
+	/**
+	 * 需求单号
+	 */
+	private String requirementCode;
+
+	/**
+	 * 提报单位
+	 */
+	private String reportUnit;
+
+	/**
+	 * 维修班组
+	 */
+	private Long maintenanceTeam;
+
+	/**
+	 * 派单时间（客服）
+	 */
+	private Date dispatchTime;
+
+	/**
+	 * 计划完成时间
+	 */
+	private Date planCompleteTime;
+
+	/**
+	 * 维修人员
+	 */
+	private Long repairPerson;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+	/**
+	 * 接单时间（维修人员）
+	 */
+	private Date receiveOrderTime;
+
+	/**
+	 * 故障原因
+	 */
+	private String faultCause;
+
+	/**
+	 * 处理方法
+	 */
+	private String processMethod;
+
+	/**
+	 * 是否需要申领物料(0否 1是)
+	 */
+	private Integer isNeedMaterial;
+
+	/**
+	 * 审批结果（0不通过 1通过）
+	 */
+	private Integer approveResult;
+
+	/**
+	 * 审批人
+	 */
+	private Long approvePerson;
+
+	/**
+	 * 审批时间
+	 */
+	private Date approveTime;
+
+	/**
+	 * 审批备注
+	 */
+	private String approveRemark;
+
+	/**
+	 * 评价质量是否满意(0否 1是)
+	 */
+	private Integer isOkQuality;
+
+	/**
+	 * 评价安全是否满意(0否 1是)
+	 */
+	private Integer isOkSecure;
+
+	/**
+	 * 评价时效是否满意(0否 1是)
+	 */
+	private Integer isOkValidity;
+
+	/**
+	 * 签名图片地址
+	 */
+	private String signatureUrl;
+
+	/**
+	 * 签名人
+	 */
+	private Long signaturePerson;
+
+	/**
+	 * 签名时间
+	 */
+	private Date signatureTime;
+}

src/main/java/org/springblade/modules/workOrder/entity/WorkOrderAttach.java

@@ -16,7 +16,40 @@ import org.springblade.core.mp.base.BaseEntity;
 @TableName("busin_work_order_attach")
 @ApiModel(value = "WorkOrderAttach对象", description = "工单附件表")
 @EqualsAndHashCode(callSuper = true)
-public class WorkOrderAttachEntity extends BaseEntity {
+public class WorkOrderAttach extends BaseEntity {
 
+	/**
+	 * 工单id
+	 */
+	private Long orderId;
 
+	/**
+	 * 附件地址
+	 */
+	private String link;
+
+	/**
+	 * 附件名称
+	 */
+	private String name;
+
+	/**
+	 * 附件原名
+	 */
+	private String originalName;
+
+	/**
+	 * 附件拓展名
+	 */
+	private String extension;
+
+	/**
+	 * 附件大小
+	 */
+	private Long attachSize;
+
+	/**
+	 * 附件类型（1图片 2视频 3签名）
+	 */
+	private Integer attachType;
 }

src/main/java/org/springblade/modules/workOrder/entity/WorkOrderEntity.java

@@ -1,22 +0,0 @@
-package org.springblade.modules.workOrder.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import io.swagger.annotations.ApiModel;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
-
-/**
- * 工单表 实体类
- *
- * @author BladeX
- * @since 2024-10-14
- */
-@Data
-@TableName("busin_work_order")
-@ApiModel(value = "WorkOrder对象", description = "工单表")
-@EqualsAndHashCode(callSuper = true)
-public class WorkOrderEntity extends BaseEntity {
-
-
-}

src/main/java/org/springblade/modules/workOrder/entity/WorkOrderRepairMaterial.java

@@ -16,7 +16,25 @@ import org.springblade.core.mp.base.BaseEntity;
 @TableName("busin_work_order_repair_material")
 @ApiModel(value = "WorkOrderRepairMaterial对象", description = "工单维修材料表")
 @EqualsAndHashCode(callSuper = true)
-public class WorkOrderRepairMaterialEntity extends BaseEntity {
+public class WorkOrderRepairMaterial extends BaseEntity {
 
+	/**
+	 * 工单id
+	 */
+	private Long orderId;
 
+	/**
+	 * 物料名称
+	 */
+	private String materialName;
+
+	/**
+	 * 数量
+	 */
+	private Integer materialCount;
+
+	/**
+	 * 价格
+	 */
+	private Double materialPrice;
 }

src/main/java/org/springblade/modules/workOrder/mapper/DeviceAttachMapper.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.mapper;
 
-import org.springblade.modules.workOrder.entity.DeviceAttachEntity;
+import org.springblade.modules.workOrder.entity.DeviceAttach;
 import org.springblade.modules.workOrder.vo.DeviceAttachVO;
 import org.springblade.modules.workOrder.excel.DeviceAttachExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -31,7 +31,7 @@ import java.util.List;
  * @author BladeX
  * @since 2024-10-14
  */
-public interface DeviceAttachMapper extends BaseMapper<DeviceAttachEntity> {
+public interface DeviceAttachMapper extends BaseMapper<DeviceAttach> {
 
 	/**
 	 * 自定义分页
@@ -49,6 +49,6 @@ public interface DeviceAttachMapper extends BaseMapper<DeviceAttachEntity> {
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<DeviceAttachExcel> exportDeviceAttach(@Param("ew") Wrapper<DeviceAttachEntity> queryWrapper);
+	List<DeviceAttachExcel> exportDeviceAttach(@Param("ew") Wrapper<DeviceAttach> queryWrapper);
 
 }

src/main/java/org/springblade/modules/workOrder/mapper/DeviceAttachMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.modules.workOrder.mapper.DeviceAttachMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="deviceAttachResultMap" type="org.springblade.modules.workOrder.entity.DeviceAttachEntity">
+    <resultMap id="deviceAttachResultMap" type="org.springblade.modules.workOrder.entity.DeviceAttach">
     </resultMap>
 
 

src/main/java/org/springblade/modules/workOrder/mapper/DeviceMapper.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.mapper;
 
-import org.springblade.modules.workOrder.entity.DeviceEntity;
+import org.springblade.modules.workOrder.entity.Device;
 import org.springblade.modules.workOrder.vo.DeviceVO;
 import org.springblade.modules.workOrder.excel.DeviceExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -31,7 +31,7 @@ import java.util.List;
  * @author BladeX
  * @since 2024-10-14
  */
-public interface DeviceMapper extends BaseMapper<DeviceEntity> {
+public interface DeviceMapper extends BaseMapper<Device> {
 
 	/**
 	 * 自定义分页
@@ -49,6 +49,6 @@ public interface DeviceMapper extends BaseMapper<DeviceEntity> {
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<DeviceExcel> exportDevice(@Param("ew") Wrapper<DeviceEntity> queryWrapper);
+	List<DeviceExcel> exportDevice(@Param("ew") Wrapper<Device> queryWrapper);
 
 }

src/main/java/org/springblade/modules/workOrder/mapper/DeviceMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.modules.workOrder.mapper.DeviceMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="deviceResultMap" type="org.springblade.modules.workOrder.entity.DeviceEntity">
+    <resultMap id="deviceResultMap" type="org.springblade.modules.workOrder.entity.Device">
     </resultMap>
 
 

src/main/java/org/springblade/modules/workOrder/mapper/FeedbackMapper.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.mapper;
 
-import org.springblade.modules.workOrder.entity.FeedbackEntity;
+import org.springblade.modules.workOrder.entity.Feedback;
 import org.springblade.modules.workOrder.vo.FeedbackVO;
 import org.springblade.modules.workOrder.excel.FeedbackExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -31,7 +31,7 @@ import java.util.List;
  * @author BladeX
  * @since 2024-10-14
  */
-public interface FeedbackMapper extends BaseMapper<FeedbackEntity> {
+public interface FeedbackMapper extends BaseMapper<Feedback> {
 
 	/**
 	 * 自定义分页
@@ -49,6 +49,6 @@ public interface FeedbackMapper extends BaseMapper<FeedbackEntity> {
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<FeedbackExcel> exportFeedback(@Param("ew") Wrapper<FeedbackEntity> queryWrapper);
+	List<FeedbackExcel> exportFeedback(@Param("ew") Wrapper<Feedback> queryWrapper);
 
 }

src/main/java/org/springblade/modules/workOrder/mapper/FeedbackMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.modules.workOrder.mapper.FeedbackMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="feedbackResultMap" type="org.springblade.modules.workOrder.entity.FeedbackEntity">
+    <resultMap id="feedbackResultMap" type="org.springblade.modules.workOrder.entity.Feedback">
     </resultMap>
 
 

src/main/java/org/springblade/modules/workOrder/mapper/InformationAttachMapper.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.mapper;
 
-import org.springblade.modules.workOrder.entity.InformationAttachEntity;
+import org.springblade.modules.workOrder.entity.InformationAttach;
 import org.springblade.modules.workOrder.vo.InformationAttachVO;
 import org.springblade.modules.workOrder.excel.InformationAttachExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -31,7 +31,7 @@ import java.util.List;
  * @author BladeX
  * @since 2024-10-14
  */
-public interface InformationAttachMapper extends BaseMapper<InformationAttachEntity> {
+public interface InformationAttachMapper extends BaseMapper<InformationAttach> {
 
 	/**
 	 * 自定义分页
@@ -49,6 +49,6 @@ public interface InformationAttachMapper extends BaseMapper<InformationAttachEnt
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<InformationAttachExcel> exportInformationAttach(@Param("ew") Wrapper<InformationAttachEntity> queryWrapper);
+	List<InformationAttachExcel> exportInformationAttach(@Param("ew") Wrapper<InformationAttach> queryWrapper);
 
 }

src/main/java/org/springblade/modules/workOrder/mapper/InformationAttachMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.modules.workOrder.mapper.InformationAttachMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="informationAttachResultMap" type="org.springblade.modules.workOrder.entity.InformationAttachEntity">
+    <resultMap id="informationAttachResultMap" type="org.springblade.modules.workOrder.entity.InformationAttach">
     </resultMap>
 
 

src/main/java/org/springblade/modules/workOrder/mapper/InformationMapper.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.mapper;
 
-import org.springblade.modules.workOrder.entity.InformationEntity;
+import org.springblade.modules.workOrder.entity.Information;
 import org.springblade.modules.workOrder.vo.InformationVO;
 import org.springblade.modules.workOrder.excel.InformationExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -31,7 +31,7 @@ import java.util.List;
  * @author BladeX
  * @since 2024-10-14
  */
-public interface InformationMapper extends BaseMapper<InformationEntity> {
+public interface InformationMapper extends BaseMapper<Information> {
 
 	/**
 	 * 自定义分页
@@ -49,6 +49,6 @@ public interface InformationMapper extends BaseMapper<InformationEntity> {
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<InformationExcel> exportInformation(@Param("ew") Wrapper<InformationEntity> queryWrapper);
+	List<InformationExcel> exportInformation(@Param("ew") Wrapper<Information> queryWrapper);
 
 }

src/main/java/org/springblade/modules/workOrder/mapper/InformationMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.modules.workOrder.mapper.InformationMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="informationResultMap" type="org.springblade.modules.workOrder.entity.InformationEntity">
+    <resultMap id="informationResultMap" type="org.springblade.modules.workOrder.entity.Information">
     </resultMap>
 
 

src/main/java/org/springblade/modules/workOrder/mapper/WorkOrderAttachMapper.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.mapper;
 
-import org.springblade.modules.workOrder.entity.WorkOrderAttachEntity;
+import org.springblade.modules.workOrder.entity.WorkOrderAttach;
 import org.springblade.modules.workOrder.vo.WorkOrderAttachVO;
 import org.springblade.modules.workOrder.excel.WorkOrderAttachExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -31,7 +31,7 @@ import java.util.List;
  * @author BladeX
  * @since 2024-10-14
  */
-public interface WorkOrderAttachMapper extends BaseMapper<WorkOrderAttachEntity> {
+public interface WorkOrderAttachMapper extends BaseMapper<WorkOrderAttach> {
 
 	/**
 	 * 自定义分页
@@ -49,6 +49,6 @@ public interface WorkOrderAttachMapper extends BaseMapper<WorkOrderAttachEntity>
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<WorkOrderAttachExcel> exportWorkOrderAttach(@Param("ew") Wrapper<WorkOrderAttachEntity> queryWrapper);
+	List<WorkOrderAttachExcel> exportWorkOrderAttach(@Param("ew") Wrapper<WorkOrderAttach> queryWrapper);
 
 }

src/main/java/org/springblade/modules/workOrder/mapper/WorkOrderAttachMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.modules.workOrder.mapper.WorkOrderAttachMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="workOrderAttachResultMap" type="org.springblade.modules.workOrder.entity.WorkOrderAttachEntity">
+    <resultMap id="workOrderAttachResultMap" type="org.springblade.modules.workOrder.entity.WorkOrderAttach">
     </resultMap>
 
 

src/main/java/org/springblade/modules/workOrder/mapper/WorkOrderMapper.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.mapper;
 
-import org.springblade.modules.workOrder.entity.WorkOrderEntity;
+import org.springblade.modules.workOrder.entity.WorkOrder;
 import org.springblade.modules.workOrder.vo.WorkOrderVO;
 import org.springblade.modules.workOrder.excel.WorkOrderExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -31,7 +31,7 @@ import java.util.List;
  * @author BladeX
  * @since 2024-10-14
  */
-public interface WorkOrderMapper extends BaseMapper<WorkOrderEntity> {
+public interface WorkOrderMapper extends BaseMapper<WorkOrder> {
 
 	/**
 	 * 自定义分页
@@ -49,6 +49,6 @@ public interface WorkOrderMapper extends BaseMapper<WorkOrderEntity> {
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<WorkOrderExcel> exportWorkOrder(@Param("ew") Wrapper<WorkOrderEntity> queryWrapper);
+	List<WorkOrderExcel> exportWorkOrder(@Param("ew") Wrapper<WorkOrder> queryWrapper);
 
 }

src/main/java/org/springblade/modules/workOrder/mapper/WorkOrderMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.modules.workOrder.mapper.WorkOrderMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="workOrderResultMap" type="org.springblade.modules.workOrder.entity.WorkOrderEntity">
+    <resultMap id="workOrderResultMap" type="org.springblade.modules.workOrder.entity.WorkOrder">
     </resultMap>
 
 

src/main/java/org/springblade/modules/workOrder/mapper/WorkOrderRepairMaterialMapper.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.mapper;
 
-import org.springblade.modules.workOrder.entity.WorkOrderRepairMaterialEntity;
+import org.springblade.modules.workOrder.entity.WorkOrderRepairMaterial;
 import org.springblade.modules.workOrder.vo.WorkOrderRepairMaterialVO;
 import org.springblade.modules.workOrder.excel.WorkOrderRepairMaterialExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -31,7 +31,7 @@ import java.util.List;
  * @author BladeX
  * @since 2024-10-14
  */
-public interface WorkOrderRepairMaterialMapper extends BaseMapper<WorkOrderRepairMaterialEntity> {
+public interface WorkOrderRepairMaterialMapper extends BaseMapper<WorkOrderRepairMaterial> {
 
 	/**
 	 * 自定义分页
@@ -49,6 +49,6 @@ public interface WorkOrderRepairMaterialMapper extends BaseMapper<WorkOrderRepai
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<WorkOrderRepairMaterialExcel> exportWorkOrderRepairMaterial(@Param("ew") Wrapper<WorkOrderRepairMaterialEntity> queryWrapper);
+	List<WorkOrderRepairMaterialExcel> exportWorkOrderRepairMaterial(@Param("ew") Wrapper<WorkOrderRepairMaterial> queryWrapper);
 
 }

src/main/java/org/springblade/modules/workOrder/mapper/WorkOrderRepairMaterialMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.modules.workOrder.mapper.WorkOrderRepairMaterialMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="workOrderRepairMaterialResultMap" type="org.springblade.modules.workOrder.entity.WorkOrderRepairMaterialEntity">
+    <resultMap id="workOrderRepairMaterialResultMap" type="org.springblade.modules.workOrder.entity.WorkOrderRepairMaterial">
     </resultMap>
 
 

src/main/java/org/springblade/modules/workOrder/service/IDeviceAttachService.java

@@ -17,7 +17,7 @@
 package org.springblade.modules.workOrder.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import org.springblade.modules.workOrder.entity.DeviceAttachEntity;
+import org.springblade.modules.workOrder.entity.DeviceAttach;
 import org.springblade.modules.workOrder.vo.DeviceAttachVO;
 import org.springblade.modules.workOrder.excel.DeviceAttachExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -30,7 +30,7 @@ import java.util.List;
  * @author BladeX
  * @since 2024-10-14
  */
-public interface IDeviceAttachService extends BaseService<DeviceAttachEntity> {
+public interface IDeviceAttachService extends BaseService<DeviceAttach> {
 	/**
 	 * 自定义分页
 	 *
@@ -47,6 +47,6 @@ public interface IDeviceAttachService extends BaseService<DeviceAttachEntity> {
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<DeviceAttachExcel> exportDeviceAttach(Wrapper<DeviceAttachEntity> queryWrapper);
+	List<DeviceAttachExcel> exportDeviceAttach(Wrapper<DeviceAttach> queryWrapper);
 
 }

src/main/java/org/springblade/modules/workOrder/service/IDeviceService.java

@@ -17,7 +17,7 @@
 package org.springblade.modules.workOrder.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import org.springblade.modules.workOrder.entity.DeviceEntity;
+import org.springblade.modules.workOrder.entity.Device;
 import org.springblade.modules.workOrder.vo.DeviceVO;
 import org.springblade.modules.workOrder.excel.DeviceExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -30,7 +30,7 @@ import java.util.List;
  * @author BladeX
  * @since 2024-10-14
  */
-public interface IDeviceService extends BaseService<DeviceEntity> {
+public interface IDeviceService extends BaseService<Device> {
 	/**
 	 * 自定义分页
 	 *
@@ -47,6 +47,6 @@ public interface IDeviceService extends BaseService<DeviceEntity> {
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<DeviceExcel> exportDevice(Wrapper<DeviceEntity> queryWrapper);
+	List<DeviceExcel> exportDevice(Wrapper<Device> queryWrapper);
 
 }

src/main/java/org/springblade/modules/workOrder/service/IFeedbackService.java

@@ -17,7 +17,7 @@
 package org.springblade.modules.workOrder.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import org.springblade.modules.workOrder.entity.FeedbackEntity;
+import org.springblade.modules.workOrder.entity.Feedback;
 import org.springblade.modules.workOrder.vo.FeedbackVO;
 import org.springblade.modules.workOrder.excel.FeedbackExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -30,7 +30,7 @@ import java.util.List;
  * @author BladeX
  * @since 2024-10-14
  */
-public interface IFeedbackService extends BaseService<FeedbackEntity> {
+public interface IFeedbackService extends BaseService<Feedback> {
 	/**
 	 * 自定义分页
 	 *
@@ -47,6 +47,6 @@ public interface IFeedbackService extends BaseService<FeedbackEntity> {
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<FeedbackExcel> exportFeedback(Wrapper<FeedbackEntity> queryWrapper);
+	List<FeedbackExcel> exportFeedback(Wrapper<Feedback> queryWrapper);
 
 }

src/main/java/org/springblade/modules/workOrder/service/IInformationAttachService.java

@@ -17,7 +17,7 @@
 package org.springblade.modules.workOrder.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import org.springblade.modules.workOrder.entity.InformationAttachEntity;
+import org.springblade.modules.workOrder.entity.InformationAttach;
 import org.springblade.modules.workOrder.vo.InformationAttachVO;
 import org.springblade.modules.workOrder.excel.InformationAttachExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -30,7 +30,7 @@ import java.util.List;
  * @author BladeX
  * @since 2024-10-14
  */
-public interface IInformationAttachService extends BaseService<InformationAttachEntity> {
+public interface IInformationAttachService extends BaseService<InformationAttach> {
 	/**
 	 * 自定义分页
 	 *
@@ -47,6 +47,6 @@ public interface IInformationAttachService extends BaseService<InformationAttach
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<InformationAttachExcel> exportInformationAttach(Wrapper<InformationAttachEntity> queryWrapper);
+	List<InformationAttachExcel> exportInformationAttach(Wrapper<InformationAttach> queryWrapper);
 
 }

src/main/java/org/springblade/modules/workOrder/service/IInformationService.java

@@ -17,7 +17,7 @@
 package org.springblade.modules.workOrder.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import org.springblade.modules.workOrder.entity.InformationEntity;
+import org.springblade.modules.workOrder.entity.Information;
 import org.springblade.modules.workOrder.vo.InformationVO;
 import org.springblade.modules.workOrder.excel.InformationExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -30,7 +30,7 @@ import java.util.List;
  * @author BladeX
  * @since 2024-10-14
  */
-public interface IInformationService extends BaseService<InformationEntity> {
+public interface IInformationService extends BaseService<Information> {
 	/**
 	 * 自定义分页
 	 *
@@ -47,6 +47,6 @@ public interface IInformationService extends BaseService<InformationEntity> {
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<InformationExcel> exportInformation(Wrapper<InformationEntity> queryWrapper);
+	List<InformationExcel> exportInformation(Wrapper<Information> queryWrapper);
 
 }

src/main/java/org/springblade/modules/workOrder/service/IWorkOrderAttachService.java

@@ -17,7 +17,7 @@
 package org.springblade.modules.workOrder.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import org.springblade.modules.workOrder.entity.WorkOrderAttachEntity;
+import org.springblade.modules.workOrder.entity.WorkOrderAttach;
 import org.springblade.modules.workOrder.vo.WorkOrderAttachVO;
 import org.springblade.modules.workOrder.excel.WorkOrderAttachExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -30,7 +30,7 @@ import java.util.List;
  * @author BladeX
  * @since 2024-10-14
  */
-public interface IWorkOrderAttachService extends BaseService<WorkOrderAttachEntity> {
+public interface IWorkOrderAttachService extends BaseService<WorkOrderAttach> {
 	/**
 	 * 自定义分页
 	 *
@@ -47,6 +47,6 @@ public interface IWorkOrderAttachService extends BaseService<WorkOrderAttachEnti
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<WorkOrderAttachExcel> exportWorkOrderAttach(Wrapper<WorkOrderAttachEntity> queryWrapper);
+	List<WorkOrderAttachExcel> exportWorkOrderAttach(Wrapper<WorkOrderAttach> queryWrapper);
 
 }

src/main/java/org/springblade/modules/workOrder/service/IWorkOrderRepairMaterialService.java

@@ -17,7 +17,7 @@
 package org.springblade.modules.workOrder.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import org.springblade.modules.workOrder.entity.WorkOrderRepairMaterialEntity;
+import org.springblade.modules.workOrder.entity.WorkOrderRepairMaterial;
 import org.springblade.modules.workOrder.vo.WorkOrderRepairMaterialVO;
 import org.springblade.modules.workOrder.excel.WorkOrderRepairMaterialExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -30,7 +30,7 @@ import java.util.List;
  * @author BladeX
  * @since 2024-10-14
  */
-public interface IWorkOrderRepairMaterialService extends BaseService<WorkOrderRepairMaterialEntity> {
+public interface IWorkOrderRepairMaterialService extends BaseService<WorkOrderRepairMaterial> {
 	/**
 	 * 自定义分页
 	 *
@@ -47,6 +47,6 @@ public interface IWorkOrderRepairMaterialService extends BaseService<WorkOrderRe
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<WorkOrderRepairMaterialExcel> exportWorkOrderRepairMaterial(Wrapper<WorkOrderRepairMaterialEntity> queryWrapper);
+	List<WorkOrderRepairMaterialExcel> exportWorkOrderRepairMaterial(Wrapper<WorkOrderRepairMaterial> queryWrapper);
 
 }

src/main/java/org/springblade/modules/workOrder/service/IWorkOrderService.java

@@ -17,7 +17,7 @@
 package org.springblade.modules.workOrder.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import org.springblade.modules.workOrder.entity.WorkOrderEntity;
+import org.springblade.modules.workOrder.entity.WorkOrder;
 import org.springblade.modules.workOrder.vo.WorkOrderVO;
 import org.springblade.modules.workOrder.excel.WorkOrderExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -30,7 +30,7 @@ import java.util.List;
  * @author BladeX
  * @since 2024-10-14
  */
-public interface IWorkOrderService extends BaseService<WorkOrderEntity> {
+public interface IWorkOrderService extends BaseService<WorkOrder> {
 	/**
 	 * 自定义分页
 	 *
@@ -47,6 +47,6 @@ public interface IWorkOrderService extends BaseService<WorkOrderEntity> {
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<WorkOrderExcel> exportWorkOrder(Wrapper<WorkOrderEntity> queryWrapper);
+	List<WorkOrderExcel> exportWorkOrder(Wrapper<WorkOrder> queryWrapper);
 
 }

src/main/java/org/springblade/modules/workOrder/service/impl/DeviceAttachServiceImpl.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.service.impl;
 
-import org.springblade.modules.workOrder.entity.DeviceAttachEntity;
+import org.springblade.modules.workOrder.entity.DeviceAttach;
 import org.springblade.modules.workOrder.vo.DeviceAttachVO;
 import org.springblade.modules.workOrder.excel.DeviceAttachExcel;
 import org.springblade.modules.workOrder.mapper.DeviceAttachMapper;
@@ -34,7 +34,7 @@ import java.util.List;
  * @since 2024-10-14
  */
 @Service
-public class DeviceAttachServiceImpl extends BaseServiceImpl<DeviceAttachMapper, DeviceAttachEntity> implements IDeviceAttachService {
+public class DeviceAttachServiceImpl extends BaseServiceImpl<DeviceAttachMapper, DeviceAttach> implements IDeviceAttachService {
 
 	@Override
 	public IPage<DeviceAttachVO> selectDeviceAttachPage(IPage<DeviceAttachVO> page, DeviceAttachVO deviceAttach) {
@@ -43,7 +43,7 @@ public class DeviceAttachServiceImpl extends BaseServiceImpl<DeviceAttachMapper,
 
 
 	@Override
-	public List<DeviceAttachExcel> exportDeviceAttach(Wrapper<DeviceAttachEntity> queryWrapper) {
+	public List<DeviceAttachExcel> exportDeviceAttach(Wrapper<DeviceAttach> queryWrapper) {
 		List<DeviceAttachExcel> deviceAttachList = baseMapper.exportDeviceAttach(queryWrapper);
 		//deviceAttachList.forEach(deviceAttach -> {
 		//	deviceAttach.setTypeName(DictCache.getValue(DictEnum.YES_NO, DeviceAttach.getType()));

src/main/java/org/springblade/modules/workOrder/service/impl/DeviceServiceImpl.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.service.impl;
 
-import org.springblade.modules.workOrder.entity.DeviceEntity;
+import org.springblade.modules.workOrder.entity.Device;
 import org.springblade.modules.workOrder.vo.DeviceVO;
 import org.springblade.modules.workOrder.excel.DeviceExcel;
 import org.springblade.modules.workOrder.mapper.DeviceMapper;
@@ -34,7 +34,7 @@ import java.util.List;
  * @since 2024-10-14
  */
 @Service
-public class DeviceServiceImpl extends BaseServiceImpl<DeviceMapper, DeviceEntity> implements IDeviceService {
+public class DeviceServiceImpl extends BaseServiceImpl<DeviceMapper, Device> implements IDeviceService {
 
 	@Override
 	public IPage<DeviceVO> selectDevicePage(IPage<DeviceVO> page, DeviceVO device) {
@@ -43,7 +43,7 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceMapper, DeviceEntit
 
 
 	@Override
-	public List<DeviceExcel> exportDevice(Wrapper<DeviceEntity> queryWrapper) {
+	public List<DeviceExcel> exportDevice(Wrapper<Device> queryWrapper) {
 		List<DeviceExcel> deviceList = baseMapper.exportDevice(queryWrapper);
 		//deviceList.forEach(device -> {
 		//	device.setTypeName(DictCache.getValue(DictEnum.YES_NO, Device.getType()));

src/main/java/org/springblade/modules/workOrder/service/impl/FeedbackServiceImpl.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.service.impl;
 
-import org.springblade.modules.workOrder.entity.FeedbackEntity;
+import org.springblade.modules.workOrder.entity.Feedback;
 import org.springblade.modules.workOrder.vo.FeedbackVO;
 import org.springblade.modules.workOrder.excel.FeedbackExcel;
 import org.springblade.modules.workOrder.mapper.FeedbackMapper;
@@ -34,7 +34,7 @@ import java.util.List;
  * @since 2024-10-14
  */
 @Service
-public class FeedbackServiceImpl extends BaseServiceImpl<FeedbackMapper, FeedbackEntity> implements IFeedbackService {
+public class FeedbackServiceImpl extends BaseServiceImpl<FeedbackMapper, Feedback> implements IFeedbackService {
 
 	@Override
 	public IPage<FeedbackVO> selectFeedbackPage(IPage<FeedbackVO> page, FeedbackVO feedback) {
@@ -43,7 +43,7 @@ public class FeedbackServiceImpl extends BaseServiceImpl<FeedbackMapper, Feedbac
 
 
 	@Override
-	public List<FeedbackExcel> exportFeedback(Wrapper<FeedbackEntity> queryWrapper) {
+	public List<FeedbackExcel> exportFeedback(Wrapper<Feedback> queryWrapper) {
 		List<FeedbackExcel> feedbackList = baseMapper.exportFeedback(queryWrapper);
 		//feedbackList.forEach(feedback -> {
 		//	feedback.setTypeName(DictCache.getValue(DictEnum.YES_NO, Feedback.getType()));

src/main/java/org/springblade/modules/workOrder/service/impl/InformationAttachServiceImpl.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.service.impl;
 
-import org.springblade.modules.workOrder.entity.InformationAttachEntity;
+import org.springblade.modules.workOrder.entity.InformationAttach;
 import org.springblade.modules.workOrder.vo.InformationAttachVO;
 import org.springblade.modules.workOrder.excel.InformationAttachExcel;
 import org.springblade.modules.workOrder.mapper.InformationAttachMapper;
@@ -34,7 +34,7 @@ import java.util.List;
  * @since 2024-10-14
  */
 @Service
-public class InformationAttachServiceImpl extends BaseServiceImpl<InformationAttachMapper, InformationAttachEntity> implements IInformationAttachService {
+public class InformationAttachServiceImpl extends BaseServiceImpl<InformationAttachMapper, InformationAttach> implements IInformationAttachService {
 
 	@Override
 	public IPage<InformationAttachVO> selectInformationAttachPage(IPage<InformationAttachVO> page, InformationAttachVO informationAttach) {
@@ -43,7 +43,7 @@ public class InformationAttachServiceImpl extends BaseServiceImpl<InformationAtt
 
 
 	@Override
-	public List<InformationAttachExcel> exportInformationAttach(Wrapper<InformationAttachEntity> queryWrapper) {
+	public List<InformationAttachExcel> exportInformationAttach(Wrapper<InformationAttach> queryWrapper) {
 		List<InformationAttachExcel> informationAttachList = baseMapper.exportInformationAttach(queryWrapper);
 		//informationAttachList.forEach(informationAttach -> {
 		//	informationAttach.setTypeName(DictCache.getValue(DictEnum.YES_NO, InformationAttach.getType()));

src/main/java/org/springblade/modules/workOrder/service/impl/InformationServiceImpl.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.service.impl;
 
-import org.springblade.modules.workOrder.entity.InformationEntity;
+import org.springblade.modules.workOrder.entity.Information;
 import org.springblade.modules.workOrder.vo.InformationVO;
 import org.springblade.modules.workOrder.excel.InformationExcel;
 import org.springblade.modules.workOrder.mapper.InformationMapper;
@@ -34,7 +34,7 @@ import java.util.List;
  * @since 2024-10-14
  */
 @Service
-public class InformationServiceImpl extends BaseServiceImpl<InformationMapper, InformationEntity> implements IInformationService {
+public class InformationServiceImpl extends BaseServiceImpl<InformationMapper, Information> implements IInformationService {
 
 	@Override
 	public IPage<InformationVO> selectInformationPage(IPage<InformationVO> page, InformationVO information) {
@@ -43,7 +43,7 @@ public class InformationServiceImpl extends BaseServiceImpl<InformationMapper, I
 
 
 	@Override
-	public List<InformationExcel> exportInformation(Wrapper<InformationEntity> queryWrapper) {
+	public List<InformationExcel> exportInformation(Wrapper<Information> queryWrapper) {
 		List<InformationExcel> informationList = baseMapper.exportInformation(queryWrapper);
 		//informationList.forEach(information -> {
 		//	information.setTypeName(DictCache.getValue(DictEnum.YES_NO, Information.getType()));

src/main/java/org/springblade/modules/workOrder/service/impl/WorkOrderAttachServiceImpl.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.service.impl;
 
-import org.springblade.modules.workOrder.entity.WorkOrderAttachEntity;
+import org.springblade.modules.workOrder.entity.WorkOrderAttach;
 import org.springblade.modules.workOrder.vo.WorkOrderAttachVO;
 import org.springblade.modules.workOrder.excel.WorkOrderAttachExcel;
 import org.springblade.modules.workOrder.mapper.WorkOrderAttachMapper;
@@ -34,7 +34,7 @@ import java.util.List;
  * @since 2024-10-14
  */
 @Service
-public class WorkOrderAttachServiceImpl extends BaseServiceImpl<WorkOrderAttachMapper, WorkOrderAttachEntity> implements IWorkOrderAttachService {
+public class WorkOrderAttachServiceImpl extends BaseServiceImpl<WorkOrderAttachMapper, WorkOrderAttach> implements IWorkOrderAttachService {
 
 	@Override
 	public IPage<WorkOrderAttachVO> selectWorkOrderAttachPage(IPage<WorkOrderAttachVO> page, WorkOrderAttachVO workOrderAttach) {
@@ -43,7 +43,7 @@ public class WorkOrderAttachServiceImpl extends BaseServiceImpl<WorkOrderAttachM
 
 
 	@Override
-	public List<WorkOrderAttachExcel> exportWorkOrderAttach(Wrapper<WorkOrderAttachEntity> queryWrapper) {
+	public List<WorkOrderAttachExcel> exportWorkOrderAttach(Wrapper<WorkOrderAttach> queryWrapper) {
 		List<WorkOrderAttachExcel> workOrderAttachList = baseMapper.exportWorkOrderAttach(queryWrapper);
 		//workOrderAttachList.forEach(workOrderAttach -> {
 		//	workOrderAttach.setTypeName(DictCache.getValue(DictEnum.YES_NO, WorkOrderAttach.getType()));

src/main/java/org/springblade/modules/workOrder/service/impl/WorkOrderRepairMaterialServiceImpl.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.service.impl;
 
-import org.springblade.modules.workOrder.entity.WorkOrderRepairMaterialEntity;
+import org.springblade.modules.workOrder.entity.WorkOrderRepairMaterial;
 import org.springblade.modules.workOrder.vo.WorkOrderRepairMaterialVO;
 import org.springblade.modules.workOrder.excel.WorkOrderRepairMaterialExcel;
 import org.springblade.modules.workOrder.mapper.WorkOrderRepairMaterialMapper;
@@ -34,7 +34,7 @@ import java.util.List;
  * @since 2024-10-14
  */
 @Service
-public class WorkOrderRepairMaterialServiceImpl extends BaseServiceImpl<WorkOrderRepairMaterialMapper, WorkOrderRepairMaterialEntity> implements IWorkOrderRepairMaterialService {
+public class WorkOrderRepairMaterialServiceImpl extends BaseServiceImpl<WorkOrderRepairMaterialMapper, WorkOrderRepairMaterial> implements IWorkOrderRepairMaterialService {
 
 	@Override
 	public IPage<WorkOrderRepairMaterialVO> selectWorkOrderRepairMaterialPage(IPage<WorkOrderRepairMaterialVO> page, WorkOrderRepairMaterialVO workOrderRepairMaterial) {
@@ -43,7 +43,7 @@ public class WorkOrderRepairMaterialServiceImpl extends BaseServiceImpl<WorkOrde
 
 
 	@Override
-	public List<WorkOrderRepairMaterialExcel> exportWorkOrderRepairMaterial(Wrapper<WorkOrderRepairMaterialEntity> queryWrapper) {
+	public List<WorkOrderRepairMaterialExcel> exportWorkOrderRepairMaterial(Wrapper<WorkOrderRepairMaterial> queryWrapper) {
 		List<WorkOrderRepairMaterialExcel> workOrderRepairMaterialList = baseMapper.exportWorkOrderRepairMaterial(queryWrapper);
 		//workOrderRepairMaterialList.forEach(workOrderRepairMaterial -> {
 		//	workOrderRepairMaterial.setTypeName(DictCache.getValue(DictEnum.YES_NO, WorkOrderRepairMaterial.getType()));

src/main/java/org/springblade/modules/workOrder/service/impl/WorkOrderServiceImpl.java

@@ -16,7 +16,7 @@
  */
 package org.springblade.modules.workOrder.service.impl;
 
-import org.springblade.modules.workOrder.entity.WorkOrderEntity;
+import org.springblade.modules.workOrder.entity.WorkOrder;
 import org.springblade.modules.workOrder.vo.WorkOrderVO;
 import org.springblade.modules.workOrder.excel.WorkOrderExcel;
 import org.springblade.modules.workOrder.mapper.WorkOrderMapper;
@@ -34,7 +34,7 @@ import java.util.List;
  * @since 2024-10-14
  */
 @Service
-public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkOrderEntity> implements IWorkOrderService {
+public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkOrder> implements IWorkOrderService {
 
 	@Override
 	public IPage<WorkOrderVO> selectWorkOrderPage(IPage<WorkOrderVO> page, WorkOrderVO workOrder) {
@@ -43,7 +43,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
 
 	@Override
-	public List<WorkOrderExcel> exportWorkOrder(Wrapper<WorkOrderEntity> queryWrapper) {
+	public List<WorkOrderExcel> exportWorkOrder(Wrapper<WorkOrder> queryWrapper) {
 		List<WorkOrderExcel> workOrderList = baseMapper.exportWorkOrder(queryWrapper);
 		//workOrderList.forEach(workOrder -> {
 		//	workOrder.setTypeName(DictCache.getValue(DictEnum.YES_NO, WorkOrder.getType()));

src/main/java/org/springblade/modules/workOrder/vo/DeviceAttachVO.java

@@ -16,8 +16,7 @@
  */
 package org.springblade.modules.workOrder.vo;
 
-import org.springblade.modules.workOrder.entity.DeviceAttachEntity;
+import org.springblade.modules.workOrder.entity.DeviceAttach;
-import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -29,7 +28,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class DeviceAttachVO extends DeviceAttachEntity {
+public class DeviceAttachVO extends DeviceAttach {
 	private static final long serialVersionUID = 1L;
 
 }

src/main/java/org/springblade/modules/workOrder/vo/DeviceVO.java

@@ -16,8 +16,7 @@
  */
 package org.springblade.modules.workOrder.vo;
 
-import org.springblade.modules.workOrder.entity.DeviceEntity;
+import org.springblade.modules.workOrder.entity.Device;
-import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -29,7 +28,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class DeviceVO extends DeviceEntity {
+public class DeviceVO extends Device {
 	private static final long serialVersionUID = 1L;
 
 }

src/main/java/org/springblade/modules/workOrder/vo/FeedbackVO.java

@@ -16,8 +16,7 @@
  */
 package org.springblade.modules.workOrder.vo;
 
-import org.springblade.modules.workOrder.entity.FeedbackEntity;
+import org.springblade.modules.workOrder.entity.Feedback;
-import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -29,7 +28,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class FeedbackVO extends FeedbackEntity {
+public class FeedbackVO extends Feedback {
 	private static final long serialVersionUID = 1L;
 
 }

src/main/java/org/springblade/modules/workOrder/vo/InformationAttachVO.java

@@ -16,8 +16,7 @@
  */
 package org.springblade.modules.workOrder.vo;
 
-import org.springblade.modules.workOrder.entity.InformationAttachEntity;
+import org.springblade.modules.workOrder.entity.InformationAttach;
-import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -29,7 +28,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class InformationAttachVO extends InformationAttachEntity {
+public class InformationAttachVO extends InformationAttach {
 	private static final long serialVersionUID = 1L;
 
 }

src/main/java/org/springblade/modules/workOrder/vo/InformationVO.java

@@ -16,8 +16,7 @@
  */
 package org.springblade.modules.workOrder.vo;
 
-import org.springblade.modules.workOrder.entity.InformationEntity;
+import org.springblade.modules.workOrder.entity.Information;
-import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -29,7 +28,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class InformationVO extends InformationEntity {
+public class InformationVO extends Information {
 	private static final long serialVersionUID = 1L;
 
 }

src/main/java/org/springblade/modules/workOrder/vo/WorkOrderAttachVO.java

@@ -16,8 +16,7 @@
  */
 package org.springblade.modules.workOrder.vo;
 
-import org.springblade.modules.workOrder.entity.WorkOrderAttachEntity;
+import org.springblade.modules.workOrder.entity.WorkOrderAttach;
-import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -29,7 +28,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class WorkOrderAttachVO extends WorkOrderAttachEntity {
+public class WorkOrderAttachVO extends WorkOrderAttach {
 	private static final long serialVersionUID = 1L;
 
 }

src/main/java/org/springblade/modules/workOrder/vo/WorkOrderRepairMaterialVO.java

@@ -16,8 +16,7 @@
  */
 package org.springblade.modules.workOrder.vo;
 
-import org.springblade.modules.workOrder.entity.WorkOrderRepairMaterialEntity;
+import org.springblade.modules.workOrder.entity.WorkOrderRepairMaterial;
-import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -29,7 +28,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class WorkOrderRepairMaterialVO extends WorkOrderRepairMaterialEntity {
+public class WorkOrderRepairMaterialVO extends WorkOrderRepairMaterial {
 	private static final long serialVersionUID = 1L;
 
 }

src/main/java/org/springblade/modules/workOrder/vo/WorkOrderVO.java

@@ -16,8 +16,7 @@
  */
 package org.springblade.modules.workOrder.vo;
 
-import org.springblade.modules.workOrder.entity.WorkOrderEntity;
+import org.springblade.modules.workOrder.entity.WorkOrder;
-import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -29,7 +28,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class WorkOrderVO extends WorkOrderEntity {
+public class WorkOrderVO extends WorkOrder {
 	private static final long serialVersionUID = 1L;
 
 }