Merge remote-tracking branch 'origin/master'

feige

2024-08-25 7070ffa6b493e75f79fe802dfc047ba3869d7b08

 zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java

@@ -32,7 +32,7 @@
    /**

     * 申请人

     */

    private int applyPerson;

    private String applyPerson;

    /**

     * 审批人

     */