Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-05 bf9395f1dab6d37c230d87ead0bef71757632be1

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

@@ -11,7 +11,7 @@
 * @Date 2024/11/25 11:51
 */
@Data
@ApiModel
@ApiModel("购物车")
public class MyShoppingCartVo {
   @ApiModelProperty("数据id")
   private Long id;