bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并分支，解决异常冲突

This commit is contained in:
syruan 2023-12-22 15:23:07 +08:00
parent 3e1839ce64
commit 9fa297de47
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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