Commit febe83f1 authored by linruibiao's avatar linruibiao

Merge branch 'develop'

parents c6532570 d98bdd71
Pipeline #9477 passed with stages
in 1 minute 19 seconds
......@@ -90,6 +90,7 @@ public class InstrumentPanelServiceImpl extends ServiceImpl<InstrumentPanelMappe
if (query.getUpdateTimeEnd() != null) {
where.le("p.update_time", query.getUpdateTimeEnd());
}
where.orderByDesc("p.create_time");
IPage<InstrumentPanelVo> response = baseMapper.selectInstrumentPanelList(page, where);
if(ObjectUtils.isNotEmpty(response)){
if(CollectionUtils.isNotEmpty(response.getRecords())){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment