提交 e45fe8ff authored 作者: liuhaiquan's avatar liuhaiquan

Merge remote-tracking branch 'origin/v4.9_create_goods_child_20230918' into test

...@@ -46,6 +46,7 @@ public class OrderChildVO { ...@@ -46,6 +46,7 @@ public class OrderChildVO {
private Integer goodsId; private Integer goodsId;
@ApiModelProperty(value = "货物名称", example = "煤") @ApiModelProperty(value = "货物名称", example = "煤")
private String goodsName; private String goodsName;
@MoneyOutConvert
@ApiModelProperty(value = "运费单价(元)", example = "1.23") @ApiModelProperty(value = "运费单价(元)", example = "1.23")
private BigDecimal freightPrice; private BigDecimal freightPrice;
@ApiModelProperty(value = "发货地址id", example = "1") @ApiModelProperty(value = "发货地址id", example = "1")
......
...@@ -129,6 +129,7 @@ public class AppDriverOrderChildController { ...@@ -129,6 +129,7 @@ public class AppDriverOrderChildController {
@ApiOperation(value = "分页查询运单列表",notes = "<br>By:艾庆国") @ApiOperation(value = "分页查询运单列表",notes = "<br>By:艾庆国")
@PostMapping("/pageOrderChild") @PostMapping("/pageOrderChild")
@UnitCovert(param = false)
public Result<PageData<OrderChildVO>> pageOrderChild(@RequestBody @Validated PageOrderChildOfDriverParam param) { public Result<PageData<OrderChildVO>> pageOrderChild(@RequestBody @Validated PageOrderChildOfDriverParam param) {
IPage<OrderChildVO> page = orderChildService.pageOrderChild(param); IPage<OrderChildVO> page = orderChildService.pageOrderChild(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages()); return Result.page(page.getRecords(), page.getTotal(), page.getPages());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论