From 06f455915bb9d11caa8829942f9007809ee9ae3d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 28 十一月 2024 16:37:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/model/ShoppingCart.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShoppingCart.java b/ruoyi-api/ruoyi-api-order/src/main/java/model/ShoppingCart.java
similarity index 82%
rename from ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShoppingCart.java
rename to ruoyi-api/ruoyi-api-order/src/main/java/model/ShoppingCart.java
index 410c4df..3029323 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShoppingCart.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/model/ShoppingCart.java
@@ -1,5 +1,6 @@
-package com.ruoyi.other.api.domain;
+package model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -19,9 +20,11 @@
@TableId
private Long id;
@ApiModelProperty("用户id")
+ @TableField("app_user_id")
private Long appUserId;
@ApiModelProperty("商品id")
- private Long goodsId;
+ @TableField("goods_id")
+ private Integer goodsId;
@ApiModelProperty("数量")
private Integer number;
}
--
Gitblit v1.7.1