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

yujian

2019-08-30 a8ba157aefdf0922037c197daba6b859bc30bf22

 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralDetailServiceImpl.java

@@ -149,7 +149,7 @@
                  ? "0" + monthMap.get(key).getMonth().getMonth() : monthMap.get(key).getMonth().getMonth();

            dateFormat.add(date);

         }

         List<IntegralMonthVO> voList = integralDetailMapper.selectMonthMoneyByUid(uid, dateFormat, type);

         List<IntegralMonthVO> voList = integralDetailMapper.selectMonthMoneyByUid(uid, dateFormat);



         int p = 0;

         keys = monthMap.keySet().iterator();