Merge remote-tracking branch 'origin/master'

feige

2024-11-05 b4895bdc5d9268e55c0023b92cc7c2d68ba33e46

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

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

     * 申请人

     */

    private int applyPerson;

    private String applyPerson;

    /**

     * 审批人

     */