Merge remote-tracking branch 'origin/master'

fei

3 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

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

@@ -43,6 +43,8 @@
    @Excel(name="参与本次大事的人物名字")
    private String people;

    private String fileName;

    /**
     * 地点
     */