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

Pu Zhibing

2024-10-22 009f795a6e93cbb94e4a316e0efa8cb7124743f5

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

@@ -32,4 +32,9 @@
                                         @Param("endTime") String endTime,
                                         @Param("type") Integer type,
                                         @Param("name") String name);

    List<Map<String, Object>> getAdvertisementList1(Page<Map<String, Object>> page);

    List<Map<String, Object>> getAdvertisementList2(Page<Map<String, Object>> page);

}