Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-05 bf9395f1dab6d37c230d87ead0bef71757632be1

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

@@ -23,4 +23,6 @@
   private Integer distributionMode;
   @ApiModelProperty(value = "配送地址id", required = false)
   private Integer userAddressId;
   @ApiModelProperty(value = "预计提货时间", required = false)
   private String expectedDeliveryTime;
}