Merge remote-tracking branch 'origin/div' into div

admin

2019-08-27 e6764831a890de26fcfebb4fb8f3a22e9f8cc816

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

@@ -160,8 +160,8 @@
            BigDecimal income = new BigDecimal(voList.get(p).getIncome());

            

            // 去除支出负号

            finalList.get(key).getMonth().setExpend(expend.setScale(2).toString().replace("-", ""));

            finalList.get(key).getMonth().setIncome(income.setScale(2).toString());

            finalList.get(key).getMonth().setExpend(expend.setScale(0).toString().replace("-", ""));

            finalList.get(key).getMonth().setIncome(income.setScale(0).toString());

            p++;

         }

      }