From a0a5b70e0d0df9357d09542f20dc6633a986f328 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 六月 2019 11:06:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
index 4953137..10ea7ce 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
@@ -111,7 +111,7 @@
// 鏃犳柊浜哄脊妗� 鍒欐煡璇㈤粯璁�
if (floatAD == null) {
- floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, null);
+ floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 0);
}
if (floatAD != null) {
--
Gitblit v1.8.0