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

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/entity/TaskNode.java

@@ -332,10 +332,6 @@ public class TaskNode extends Entity<Long> {
     @Excel(name = "检测频率(单位-秒)")
     private Integer examineRate;
 
-    @TableField(exist = false)
-    @Excel(name = "工艺id")
-    private Long procedureId;
-
     @ApiModelProperty(value="人工质检")
     @TableField(exist = false)
     private List<BomProcedureTest> procedureTestList;