Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-05 56f732ed7af0e82f32f809ff0797fd0b83b62306

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/ShoppingCart.java

File was renamed from ruoyi-api/ruoyi-api-order/src/main/java/model/ShoppingCart.java
@@ -1,4 +1,4 @@
package model;
package com.ruoyi.order.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;