Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-09-16 24b28c40758e03e9ef372502fa29d9072b7c909b

 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() {