Merge branch 'huacheng_test' into haucheng_panzhihua

张天森

2022-11-25 0f3db47c9a6c03611ac75118017f83d18ae062f2

 flower_city/src/main/java/com/dg/core/service/ITransactionEventService.java

@@ -151,6 +151,6 @@
     * @return
     */
    List<TransactionEvent> selectClassifyList(List<String> ids);
    boolean batchImport(String fileName, MultipartFile file) ;
    Integer batchImport(String fileName, MultipartFile file) ;

}