Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2020-01-01 eed54c262df12dd3d132bf14691915e6183afd4c

 fanli/src/main/java/com/yeshi/fanli/aspect/integral/IntegralGetFrequencyLimitAspect.java

@@ -79,7 +79,7 @@
               } finally {

               }

            } finally {

               jedisPool.returnResource(jedis);

               jedis.close();

            }

         }

      } catch (NoSuchMethodException e) {