Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-16 e7f23c16b1d1c6553a0442f3d0d129248d267670

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java

@@ -40,7 +40,7 @@
   @ApiModelProperty("积分支付")
   private Boolean pointPayment;
   @ApiModelProperty("配送方式（1=自提，2=快递）")
   private Integer distributionMode;
   private String distributionMode;
   /**
    * 可获得消费积分
    */