Merge remote-tracking branch 'origin/master'

xuhy

2024-09-13 cb02f43ad81fd2ce3e1c3e0cd95234746b7927ad

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java

@@ -303,6 +303,7 @@
      shoppingOrder.setPaymentType(exchangeDto.getPayMethod());
      shoppingOrder.setRemark(exchangeDto.getRemark());
      shoppingOrder.setStatus(1);
      shoppingOrder.setPhone(exchangeDto.getPhone());
      shoppingOrder.setCreateTime(LocalDateTime.now());
      shoppingOrder.setDelFlag(false);
      shoppingOrderService.save(shoppingOrder);