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

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/mongo/MeterReadRecordDao.java

@@ -243,7 +243,7 @@ public class MeterReadRecordDao extends BaseDao<MeterReadRecord, String> impleme
         }
         List<AggregationOperation> countQuery = aggrQueryCondition(criteria,"data",
                 dayCritera,null);
-        countQuery.add(Aggregation.sort(Sort.Direction.DESC,"data.readTime"));
+        countQuery.add(Aggregation.sort(Sort.Direction.ASC,"data.readDate"));
         AggregationOptions aggregationOptions = AggregationOptions.builder().allowDiskUse(true).build();
         AggregationResults<MeterReadRecordVo> aggregate = mongoTemplate.aggregate(Aggregation.newAggregation(countQuery).withOptions(aggregationOptions)
                 , MeterReadRecord.class, MeterReadRecordVo.class);