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

fs-service-system/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -1453,6 +1453,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         }
 
         erpOrder.setSeller_memo(order.getRemark());
+        erpOrder.setBuyer_memo(order.getRemark());
         List<ErpOrderPayment> payments = new ArrayList<>();
         ErpOrderPayment payment = new ErpOrderPayment();
         payment.setPay_type_code("weixin");