合并分支，解决异常冲突

sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java

@@ -128,9 +128,9 @@ public class TmTask implements Serializable {
     @ApiModelProperty(value="领料任务详情集合")
     private List<LeaseApplyDetails>  leaseApplyDetails;
 
-
     @ApiModelProperty(value="协议id")
     private Integer agreementId;
+
     @ApiModelProperty(value="退料人")
     private String backPerson;
     @ApiModelProperty(value="退料人联系电话")
@@ -187,12 +187,4 @@ public class TmTask implements Serializable {
 
     @ApiModelProperty(value="更新时间")
     private String updateTimes;
-
-    public String getBackTime() {
-        return backTime;
-    }
-
-    public void setBackTime(String backTime) {
-        this.backTime = backTime;
-    }
 }