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

zhibing.pu

2024-05-27 f9b9131367d9ba6fe852130b12083c0f5ea68bbb

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/IncomeMapper.java

@@ -5,6 +5,7 @@
import com.stylefeng.guns.modular.system.model.Income;
import org.apache.ibatis.annotations.Param;

import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;

@@ -21,4 +22,7 @@
                                      @Param("times") String times);

    List<Map<String,Object>> getTotal(@Param("times") String times);



}