提交 448103c6 authored 作者: 刘海泉's avatar 刘海泉

Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into dev

...@@ -21,6 +21,5 @@ public class DriverFreightPriceChartVO { ...@@ -21,6 +21,5 @@ public class DriverFreightPriceChartVO {
@ApiModelProperty("运费生效时间") @ApiModelProperty("运费生效时间")
@MoneyOutConvert
private String creatTime; private String creatTime;
} }
\ No newline at end of file
...@@ -21,6 +21,5 @@ public class HistoryLineTranVolumeChartVO { ...@@ -21,6 +21,5 @@ public class HistoryLineTranVolumeChartVO {
@ApiModelProperty("拉运单数") @ApiModelProperty("拉运单数")
@MoneyOutConvert
private Integer number; private Integer number;
} }
\ No newline at end of file
...@@ -350,7 +350,6 @@ public class PerformanceProgressServiceImpl implements PerformanceProgressServi ...@@ -350,7 +350,6 @@ public class PerformanceProgressServiceImpl implements PerformanceProgressServi
item.setSendAddressShorter(data.getSendAddressShorter()); item.setSendAddressShorter(data.getSendAddressShorter());
item.setSendAddress(sendAddress.getProvince()+sendAddress.getCity()+sendAddress.getCounty() item.setSendAddress(sendAddress.getProvince()+sendAddress.getCity()+sendAddress.getCounty()
+ sendAddress.getAddress()); + sendAddress.getAddress());
item.setSeq(seq);
performanceProgressDao.saveEntity(item); performanceProgressDao.saveEntity(item);
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论