From 0430cf26ba8646c65ffb1d1a0fbdb191a8c29d74 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 17 十一月 2022 16:30:02 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopCartDO.java | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopCartDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopCartDO.java
index df4aa71..9317e8a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopCartDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopCartDO.java
@@ -1,12 +1,12 @@
package com.panzhihua.service_community.model.dos;
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
+
+import lombok.Data;
/**
* @auther lyq
@@ -23,7 +23,7 @@
/**
* 购物车id
*/
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
@@ -85,19 +85,9 @@
@Override
public String toString() {
- return "ComShopCartDO{" +
- "id=" + id +
- ", userId=" + userId +
- ", goodsId=" + goodsId +
- ", goodsName=" + goodsName +
- ", storeId=" + storeId +
- ", goodsAttrId=" + goodsAttrId +
- ", goodsAttr=" + goodsAttr +
- ", goodsAttrPic=" + goodsAttrPic +
- ", amount=" + amount +
- ", price=" + price +
- ", createAt=" + createAt +
- ", updateAt=" + updateAt +
- "}";
+ return "ComShopCartDO{" + "id=" + id + ", userId=" + userId + ", goodsId=" + goodsId + ", goodsName="
+ + goodsName + ", storeId=" + storeId + ", goodsAttrId=" + goodsAttrId + ", goodsAttr=" + goodsAttr
+ + ", goodsAttrPic=" + goodsAttrPic + ", amount=" + amount + ", price=" + price + ", createAt=" + createAt
+ + ", updateAt=" + updateAt + "}";
}
}
\ No newline at end of file
--
Gitblit v1.7.1