From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderPreviewDTO.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderPreviewDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderPreviewDTO.java
index 03d9d3f..b0b47ff 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderPreviewDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderPreviewDTO.java
@@ -1,10 +1,10 @@
package com.panzhihua.common.model.dtos.shop;
+import java.util.List;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.List;
/**
* @auther lyq
@@ -18,7 +18,7 @@
/**
* 提交类型（1.商品详情提交 2.购物车提交）
*/
- @ApiModelProperty(value = "提交类型（1.商品详情提交 2.购物车提交）",required = true)
+ @ApiModelProperty(value = "提交类型（1.商品详情提交 2.购物车提交）", required = true)
private Integer submitType;
/**
@@ -48,16 +48,15 @@
/**
* 用户id
*/
- @ApiModelProperty(value = "用户id",hidden = true)
+ @ApiModelProperty(value = "用户id", hidden = true)
private Long userId;
/**
* 提交类型（1.商品详情提交 2.购物车提交）
*/
- public interface submitType{
+ public interface submitType {
int details = 1;
int cart = 2;
}
-
}
--
Gitblit v1.7.1