diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 8ec23ad6..0a99a2cc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -163,7 +163,7 @@ public class SarStandardComplianceAssessResultController { IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); - while(page.getRecords().remove(null)); +// while(page.getRecords().remove(null)); return Result.success(page); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java index 706bde15..bdd5c4dc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java @@ -15,7 +15,7 @@ import org.springframework.format.annotation.DateTimeFormat; /** *

- * + * *

* * @author zyl @@ -33,6 +33,7 @@ public class SarStandardComplianceProductAssess extends BaseEntity { private String productLineId; @ApiModelProperty(value = "'项目id'") + @TableField("product_id") private String productId; @ApiModelProperty(value = "'项目名称'")