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

935090232@qq.com

2021-01-17 29ba6fbd0015b9a77b5c994f43429a5a42e2ecc4

 zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java

@@ -64,7 +64,7 @@
            QueryUtil.setQueryLimitCom(achieveNew);
            achieveNew.setType(rankingDto.getType());
            achieveNew.setDatatime(new Date());
            List<RankingVo> list = achieveNewDao.selectStaffSaleAchieveRanking(achieveNew);
            List<RankingVo> list = achieveNewDao.selectShopConsumeAchieveRanking(achieveNew);
            ajaxResult.setRows(list);
        } else {
            AchieveNew achieveNew = new AchieveNew();