Merge remote-tracking branch 'origin/master'

sgj

2 天以前 18127822f3cdb4778fb62ba0304bb8372dada516

 fzzy-igdss-view/src/main/java/com/fzzy/igds/DicPR.java

@@ -132,6 +132,16 @@
    }

    /**
     * 云台方式
     * ${dorado.getDataProvider("dicPR#triggerPtzType").getResult()}
     *
     * @return
     */
    @DataProvider
    public List<SysDictData> triggerPtzType() {
        return dicService.triggerPtzType();
    }
    /**
     * 检验类别
     * <p>
     * ${dorado.getDataProvider("dicPR#triggerCheckType").getResult()}