From 9576bebcacea938771f6f5b51d958e6a4ac59df6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 09 十二月 2021 16:59:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientProductDTO.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientProductDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientProductDTO.java
index 4f8d2f5..7cf95ec 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientProductDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientProductDTO.java
@@ -55,4 +55,12 @@
 
     @ApiModelProperty(value = "所属商家", hidden = true)
     private Long merchantId;
+
+    public Boolean getOnShelf() {
+        return onShelf.intValue() == 1;
+    }
+
+    public void setOnShelf(Boolean onShelf) {
+        this.onShelf = onShelf ? 1 : 0;
+    }
 }
\ No newline at end of file

--
Gitblit v1.7.1