diff --git a/src/main/java/com/zhgd/xmgl/modules/material/entity/MaterialApproachRecord.java b/src/main/java/com/zhgd/xmgl/modules/material/entity/MaterialApproachRecord.java index 0440226f0..4af930571 100644 --- a/src/main/java/com/zhgd/xmgl/modules/material/entity/MaterialApproachRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/material/entity/MaterialApproachRecord.java @@ -56,7 +56,7 @@ public class MaterialApproachRecord implements Serializable { */ @Excel(name = "车牌号", width = 15) @ApiModelProperty(value = "车牌号") - private Integer licensePlateNumber; + private String licensePlateNumber; /** * 进场量 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/material/entity/MaterialDetectionReport.java b/src/main/java/com/zhgd/xmgl/modules/material/entity/MaterialDetectionReport.java index 29d276b28..45d881012 100644 --- a/src/main/java/com/zhgd/xmgl/modules/material/entity/MaterialDetectionReport.java +++ b/src/main/java/com/zhgd/xmgl/modules/material/entity/MaterialDetectionReport.java @@ -86,5 +86,8 @@ public class MaterialDetectionReport implements Serializable { @ApiModelProperty(value = "楼层") private String floor; + @ApiModelProperty(value = "材料种类") + private String materialType; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/material/entity/qo/MaterialDetectionReportQO.java b/src/main/java/com/zhgd/xmgl/modules/material/entity/qo/MaterialDetectionReportQO.java index 0234b299a..643d5a6e8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/material/entity/qo/MaterialDetectionReportQO.java +++ b/src/main/java/com/zhgd/xmgl/modules/material/entity/qo/MaterialDetectionReportQO.java @@ -94,6 +94,7 @@ public class MaterialDetectionReportQO implements Serializable { @ApiModelProperty(value = "楼层") private String floor; - + @ApiModelProperty(value = "材料种类") + private String materialType; } diff --git a/src/main/java/com/zhgd/xmgl/modules/material/service/impl/MaterialDetectionReportServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/material/service/impl/MaterialDetectionReportServiceImpl.java index 3674fbbd3..d2f4388ac 100644 --- a/src/main/java/com/zhgd/xmgl/modules/material/service/impl/MaterialDetectionReportServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/material/service/impl/MaterialDetectionReportServiceImpl.java @@ -50,7 +50,8 @@ public class MaterialDetectionReportServiceImpl extends ServiceImpl