Commit 0cbf18bf authored by zhengyi's avatar zhengyi

Merge branch 'master-fix'

parents 28c79d9e 69e9e162
......@@ -2610,7 +2610,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
infoVO.setNewValue(updateReqVO.getIsCargoControl() ? "是/yes" : "否/no");
vo.setIsCargoControl(updateReqVO.getIsCargoControl());
applyInfoList.add(infoVO);
vo.setIsCharge(true);
// vo.setIsCharge(true);
}
Map<Integer, CurrencyRespDTO> currencyMap = currencyApi.getAllCurrency();
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