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

yanghui

2022-11-28 0b643d15ab435b06f5fd2adccaca83621fd025de

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

}