Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-09 3ed7fcd25a5233a8fc1a00e5602e89e92ebe82ae

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java

@@ -24,7 +24,7 @@
   @ApiModelProperty(value = "配送方式（1=自提，2=快递）", required = false)
   private Integer distributionMode;
   @ApiModelProperty(value = "配送地址id", required = false)
   private Integer userAddressId;
   private Long userAddressId;
   @ApiModelProperty(value = "预计提货时间", required = false)
   private String expectedDeliveryTime;
}