Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-16 1d64c14b6b0e9bbcae2736f83c0a498b5083d1d6

 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;
   /**
    * 可获得消费积分
    */