Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zhangfeng

2022-11-08 9a73660fa673120de8fb4fdacdfe2a9f47fe9fbb

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteCountQuery.java

@@ -6,6 +6,7 @@
    // type=1:月  type=2:年
    private Integer type;

    // 部门id
    private Long deptId;

    public Integer getType() {