Merge remote-tracking branch 'origin/master'

jiangping

2024-05-31 bf8d85d5f83c2036fb4239d764d33e99c1b62bd3

 server/meeting/meeting_admin/src/main/java/com/doumee/api/common/HomeController.java

@@ -83,7 +83,7 @@
        bq2.eq(Bookings::getStatus, Constants.ZERO);
        bq2.apply("DATE_FORMAT(t.START_TIME,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d') " );
       // bq2.last("limit 1");
        bq2.select("(select count(u.id) from user_rel u where u.ISDELETED=0 and u.OBJ_ID=t.id)as bookingUser");
        bq2.select("(select count(u.id) from meeting_user_rel u where u.ISDELETED=0 and u.OBJ_ID=t.id)as bookingUser");
        List<Bookings> bk2= bookingsJoinMapper.selectJoinList(Bookings.class,bq2);

        Integer bookingUser=0;