Merge remote-tracking branch 'origin/master' into master

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/MaterialMeterForm.java

@@ -97,12 +97,12 @@ public class MaterialMeterForm extends BaseEntity {
     /**
      * 备料堆放地点
      */
-    @ApiModelProperty(value = "备料堆放地点")
+    @ApiModelProperty(value = "备料堆放地点(进料发票号)")
     private String storagePlace;
     /**
      * 存储情况
      */
-    @ApiModelProperty(value = "存储情况")
+    @ApiModelProperty(value = "存储情况(质保书编号)")
     private String storageStatus;
     /**
      * 材料来源
@@ -122,7 +122,7 @@ public class MaterialMeterForm extends BaseEntity {
     /**
      * 合格证
      */
-    @ApiModelProperty(value = "合格证")
+    @ApiModelProperty(value = "合格证(抽检报告编号)")
     private String certificate;
     /**
      * 备注

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -1358,7 +1358,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 Elements bhtitle2 = doc.select("el-input[placeholder~=^工程编号]");
                 Elements bhtitle3 = doc.select("el-input[placeholder~=^分项工程编号]");
                 Elements bhtitle4 = doc.select("el-input[placeholder~=^分部分项编号]");
-                Elements bhtitle5 = doc.select("el-input[placeholder~=^单位工程编码]");
+                Elements bhtitle5 = doc.select("el-input[placeholder~=^单元工程编码]");
                 bhtitle.addAll(bhtitle2);
                 bhtitle.addAll(bhtitle3);
                 bhtitle.addAll(bhtitle4);