Commit 2125cf2e531e3af1950fc5fb5a75b6f583fa9cac
Merge remote-tracking branch 'origin/master_0929' into master_0929
Showing
1 changed file
with
6 additions
and
0 deletions
| @@ -174,6 +174,12 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut | @@ -174,6 +174,12 @@ public class QueryContractDistributorStandardBo extends BaseBo<ContractDistribut | ||
| 174 | private String shippingStatusName; | 174 | private String shippingStatusName; |
| 175 | 175 | ||
| 176 | /** | 176 | /** |
| 177 | + * 父合同id | ||
| 178 | + */ | ||
| 179 | + @ApiModelProperty(value = "父合同id") | ||
| 180 | + private String parentId; | ||
| 181 | + | ||
| 182 | + /** | ||
| 177 | * 是否已完成锁价/锁规 | 183 | * 是否已完成锁价/锁规 |
| 178 | */ | 184 | */ |
| 179 | @ApiModelProperty(value = "是否已完成锁价/锁规") | 185 | @ApiModelProperty(value = "是否已完成锁价/锁规") |