From d85af61932a03bd03663daf9da33177af5824a5c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 14:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/shopXcx/dto/CreateGroupBuyDTO.java | 109 ++----------------------------------------------------
1 files changed, 5 insertions(+), 104 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/dto/CreateGroupBuyDTO.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/dto/CreateGroupBuyDTO.java
index 3f5f706..450560e 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/dto/CreateGroupBuyDTO.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/dto/CreateGroupBuyDTO.java
@@ -1,7 +1,10 @@
package com.matrix.system.shopXcx.dto;
+import lombok.Data;
+
import java.math.BigDecimal;
+@Data
public class CreateGroupBuyDTO {
/**
@@ -37,7 +40,7 @@
/**
* 配送方式
*/
- private String shippingMethod;
+ private Integer shippingMethod;
/**
* 拼团ID
@@ -54,111 +57,9 @@
private BigDecimal price;
- private String openId;
+ private Long userId;
private int goodsId;
- public String getOpenId() {
- return openId;
- }
- public void setOpenId(String openId) {
- this.openId = openId;
- }
-
- public int getGoodsId() {
- return goodsId;
- }
-
- public void setGoodsId(int goodsId) {
- this.goodsId = goodsId;
- }
-
- public BigDecimal getPrice() {
- return price;
- }
-
- public void setPrice(BigDecimal price) {
- this.price = price;
- }
-
- public int getJoinType() {
- return joinType;
- }
-
- public void setJoinType(int joinType) {
- this.joinType = joinType;
- }
-
- public Long getGpId() {
- return gpId;
- }
-
- public void setGpId(Long gpId) {
- this.gpId = gpId;
- }
-
- public Long getActId() {
- return actId;
- }
-
- public void setActId(Long actId) {
- this.actId = actId;
- }
-
- public Integer getAddressId() {
- return addressId;
- }
-
- public void setAddressId(Integer addressId) {
- this.addressId = addressId;
- }
-
- public Long getShopId() {
- return shopId;
- }
-
- public void setShopId(Long shopId) {
- this.shopId = shopId;
- }
-
- public String getShippingMethod() {
- return shippingMethod;
- }
-
- public void setShippingMethod(String shippingMethod) {
- this.shippingMethod = shippingMethod;
- }
-
- public Long getGjId() {
- return gjId;
- }
-
- public void setGjId(Long gjId) {
- this.gjId = gjId;
- }
-
- public Integer getSkuId() {
- return skuId;
- }
-
- public void setSkuId(Integer skuId) {
- this.skuId = skuId;
- }
-
- public Integer getCount() {
- return count;
- }
-
- public void setCount(Integer count) {
- this.count = count;
- }
-
- public String getRemarks() {
- return remarks;
- }
-
- public void setRemarks(String remarks) {
- this.remarks = remarks;
- }
}
--
Gitblit v1.9.1