Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

lidongdong

2023-01-30 63c985f072826e7c82f51b0f415454a066fd8c56

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

}