Merge branch 'huacheng_test' into haucheng_panzhihua

张天森

2022-11-25 61046f00aa8d504372a0fd6f26334846c4ba33dc

 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) ;

}