Commit 43ed21e3 authored by 332784038@qq.com's avatar 332784038@qq.com

Merge remote-tracking branch 'origin/master'

parents 4926e86c 0cbf18bf
...@@ -2610,7 +2610,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -2610,7 +2610,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
infoVO.setNewValue(updateReqVO.getIsCargoControl() ? "是/yes" : "否/no"); infoVO.setNewValue(updateReqVO.getIsCargoControl() ? "是/yes" : "否/no");
vo.setIsCargoControl(updateReqVO.getIsCargoControl()); vo.setIsCargoControl(updateReqVO.getIsCargoControl());
applyInfoList.add(infoVO); applyInfoList.add(infoVO);
vo.setIsCharge(true); // vo.setIsCharge(true);
} }
Map<Integer, CurrencyRespDTO> currencyMap = currencyApi.getAllCurrency(); Map<Integer, CurrencyRespDTO> currencyMap = currencyApi.getAllCurrency();
CurrencyRespDTO orgCurrencyRespDTO = currencyMap.get(vo.getCollectionProxyCurrency()); CurrencyRespDTO orgCurrencyRespDTO = currencyMap.get(vo.getCollectionProxyCurrency());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment