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/vos/shop/ComShopOrderGoodsVO.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderGoodsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderGoodsVO.java
index e6b5760..a154e36 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderGoodsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopOrderGoodsVO.java
@@ -1,10 +1,10 @@
package com.panzhihua.common.model.vos.shop;
+import java.math.BigDecimal;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.math.BigDecimal;
/**
* @auther lyq
@@ -58,15 +58,15 @@
private String goodsAttr;
/**
- * 商品状态(1.出售中 2.已下架 3.已删除)
+ * 商品状态(1.出售中 2.已下架 3.已删除)
*/
@ApiModelProperty(value = "商品状态(1.出售中 2.已下架 3.已删除)")
private Integer goodsStatus = 1;
/**
- * 商品状态(1.出售中 2.已下架 3.已删除)
+ * 商品状态(1.出售中 2.已下架 3.已删除)
*/
- public interface goodsStatus{
+ public interface goodsStatus {
int csz = 1;
int yxj = 2;
int ysc = 3;
--
Gitblit v1.7.1