From 57a283d06cba1fd3a6b78af590a97372774bbca6 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 10 十二月 2024 15:45:03 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4
---
src/main/java/com/mzl/flower/service/flower/FlowerService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/flower/FlowerService.java b/src/main/java/com/mzl/flower/service/flower/FlowerService.java
index f7f4821..1d768ba 100644
--- a/src/main/java/com/mzl/flower/service/flower/FlowerService.java
+++ b/src/main/java/com/mzl/flower/service/flower/FlowerService.java
@@ -724,9 +724,9 @@
s.setCollection(s.getCollectCount() > 0);
s.setShopnum(s.getShopnum() == null ? 0 : s.getShopnum());
- if(s.getSales() != null && s.getRealSales() != null){
+ /*if(s.getSales() != null && s.getRealSales() != null){
s.setSales(s.getSales() + s.getRealSales());
- }
+ }*/
}
}
}
--
Gitblit v1.9.3