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

xuhy

2024-02-01 8dd61e711d7cccd7d8d1278ab79a73e7a41aad4d

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

}