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

admin

2019-08-28 08d5529087390663115d326190635e4a4997acf2

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java

@@ -233,8 +233,9 @@
               taskClassVO.setLightUp(true);

            }



            Integer dateType = 1; // 查询当日

            if (uniqueKey == UniqueKeyEnum.orderReward)

            // 查询当日

            Integer dateType = 1; 
            if (uniqueKey == UniqueKeyEnum.orderReward || uniqueKey == UniqueKeyEnum.accountMaintain) 
               dateType = null; // 查询历史



            Long id = taskClassVO.getId();