Commit 540b33f8 authored by 朱晨阳's avatar 朱晨阳

Merge remote-tracking branch 'origin/developer' into developer

parents b3af7d9d 92dd837c
......@@ -1076,6 +1076,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
preparationMoney.setOrderStatus(DeliveryStateeEnum.待补货.getName());
up.set(PeasantHousehold::getPreparationMoneyState, DeliveryStateeEnum.待补货.getName());
up.set(PeasantHousehold::getConstructionState, DeliveryStateeEnum.待补货.getName());
peasantHouseholdMapper.update(null,up);
}else {
preparationMoney.setOrderStatus(DeliveryStateeEnum.待确认.getName());
}
......
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