Merge remote-tracking branch 'origin/master'

许鹏程

2024-08-20 0e730e50ae1adcd416fb929b37f022e595d88d79

 src/main/java/com/product/administration/service/ConferenceManagerService.java

@@ -423,8 +423,8 @@
            sql.append(" b.end_time, ");
        }
        sql.append(" b.flow_flag, ");
        sql.append(" ( SELECT user_name FROM product_sys_users WHERE user_id = b.created_by ) proposer ");
        sql.append(" FROM ");
        sql.append(" ( SELECT user_name FROM product_sys_users WHERE user_id = b.created_by ) proposer ");
        sql.append(" product_oa_CONFERENCE_room_config a ");
        sql.append(" LEFT JOIN ( SELECT flow_flag,meeting_room,uuid,meeting_topic,start_time,end_time,created_by FROM  ");
        sql.append(" product_oa_conference_apply b WHERE ");