Merge branch '2.0-dev' of http://139.159.177.244:3000/hurui/hai-server into 2.0-dev

hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java

@@ -856,6 +856,7 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService {
         childOrder.setMemId(user.getId());
         childOrder.setMemName(user.getName());
         childOrder.setMemPhone(user.getPhone());
+        childOrder.setOrderNo(order.getOrderNo());
         childOrder.setChildOrderNo(OrderUtil.generateChildOrderNo());
         childOrder.setGoodsType(OrderChildGoodsType.TYPE6.getNumber());
         childOrder.setGoodsId(goodsId);