From 4397fa6607ac892fa86c9d6e73dc9bbd94d0df7b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 14 五月 2020 18:39:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java
index 546fe93..b327acf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java
@@ -242,7 +242,7 @@
 			
 			Integer scanNum = pushGoods.getScanNum();
 			if (scanNum == null) {
-				vo.setScanNum("0");
+//				vo.setScanNum("0");
 			} else if (scanNum >= 10000) {
 				double num = scanNum;
 				String numMidea = String.format("%.1f", num / 10000);

--
Gitblit v1.8.0