Merge branch 'develop_1' into 'develop_master'

Develop 1

See merge request !51

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java

@@ -163,7 +163,7 @@ public class SarStandardComplianceAssessResultController {
 
         IPage<SarStandardComplianceProductAssess> page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper);
 
-        while(page.getRecords().remove(null));
+//        while(page.getRecords().remove(null));
 
         return Result.success(page);
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarStandardComplianceProductAssess.java

@@ -15,7 +15,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @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 = "'项目名称'")