diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMeasuringToolEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMeasuringToolEntity.java index 4c5881195..06f1f67cb 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMeasuringToolEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMeasuringToolEntity.java @@ -71,21 +71,23 @@ public class DsProcessMeasuringToolEntity extends BaseEntity { private String mtId; /** - * 量具ID + * 量具信息 */ - @Schema(description = "量具ID") - private String tool; + @Schema(description = "量具信息") + private String toolInfo; /** * 量具尺寸 */ @Schema(description = "量具尺寸") private String toolSize; + /** - * 量具信息 + * 图纸尺寸 */ - @Schema(description = "量具信息") - private String toolInfo; + @Schema(description = "图纸尺寸") + private String drawingSize; + /** * 备注 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java index 04c029a84..b3446aae2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java @@ -336,9 +336,12 @@ public class DsCraftServiceImpl extends BaseServiceImpl