Merge branch 'develop_master' into develop_migration

This commit is contained in:
super_liu
2021-08-27 18:01:18 +08:00
@@ -51,7 +51,7 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
.like(StringUtils.isNotEmpty(cname),"cname",cname)
.ge(start!=null,"start_time",start)
.le(end!=null,"end_time",end)
.orderByDesc("start_time");
.orderByAsc("end_time");
Page<SarPublicIdea> page = new Page<>(p,size);
IPage<SarPublicIdea> userIPage = sarPublicIdeaDao.selectPage(page, list);
System.out.println("总条数"+userIPage.getTotal());