FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_1' into 'develop_master'

Browse Source 
Develop 1

See merge request !51
This commit is contained in:
王夏晖
2021-07-24 01:49:13 +00:00
parent 25528d92a8 cf0d9f6c6d
commit f5ceeebbf6
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
+1 -1
View File
@@ -163,7 +163,7 @@ public class SarStandardComplianceAssessResultController {
IPage<SarStandardComplianceProductAssess> page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper); IPage<SarStandardComplianceProductAssess> page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper);
while(page.getRecords().remove(null)); // while(page.getRecords().remove(null));
return Result.success(page); return Result.success(page);
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java
+2 -1
View File
@@ -15,7 +15,7 @@ import org.springframework.format.annotation.DateTimeFormat;
/** /**
* <p> * <p>
* *
* </p> * </p>
* *
* @author zyl * @author zyl
@@ -33,6 +33,7 @@ public class SarStandardComplianceProductAssess extends BaseEntity {
private String productLineId; private String productLineId;
@ApiModelProperty(value = "'项目id'") @ApiModelProperty(value = "'项目id'")
@TableField("product_id")
private String productId; private String productId;
@ApiModelProperty(value = "'项目名称'") @ApiModelProperty(value = "'项目名称'")