From b92edf56e7e25440e7c46b967aa5373a7a8b25c2 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期一, 14 三月 2022 09:22:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderGoodsDO.java | 24 +++++++-----------------
1 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderGoodsDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderGoodsDO.java
index 8a7d9df..643b6db 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderGoodsDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderGoodsDO.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
@@ -84,19 +84,9 @@
@Override
public String toString() {
- return "ComShopOrderGoodsDO{" +
- "id=" + id +
- ", storeId=" + storeId +
- ", orderId=" + orderId +
- ", userId=" + userId +
- ", orderNo=" + orderNo +
- ", goodsId=" + goodsId +
- ", goodsAttrId=" + goodsAttrId +
- ", amount=" + amount +
- ", goodsAttrPrice=" + goodsAttrPrice +
- ", goodsAttrPic=" + goodsAttrPic +
- ", goodsName=" + goodsName +
- ", createAt=" + createAt +
- "}";
+ return "ComShopOrderGoodsDO{" + "id=" + id + ", storeId=" + storeId + ", orderId=" + orderId + ", userId="
+ + userId + ", orderNo=" + orderNo + ", goodsId=" + goodsId + ", goodsAttrId=" + goodsAttrId + ", amount="
+ + amount + ", goodsAttrPrice=" + goodsAttrPrice + ", goodsAttrPic=" + goodsAttrPic + ", goodsName="
+ + goodsName + ", createAt=" + createAt + "}";
}
}
\ No newline at end of file
--
Gitblit v1.7.1