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

无关风月

4 天以前 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/large/service/AnalysisRecycleDataService.java

@@ -22,6 +22,6 @@
     * @param analysisType
     * @return
     */
    Map<String,Long> recycleLarge(Integer analysisType);
    Map<String,Integer> recycleLarge(Integer analysisType);

}