Merge remote-tracking branch 'origin/maanshan' into maanshan

rk

2 天以前 69758b26403c3c97ad35c2c76125a1ff36a3e9d0

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/FightingAdminCenterDataVO.java

@@ -37,7 +37,7 @@
    private Integer dangerDealedNum;


    @ApiModelProperty(value = "按设备分类统计呵呵" , hidden = true)
    @ApiModelProperty(value = "按设备分类统计" , hidden = true)
    private List<DeviceNumByTypeVO> deviceTypeList;