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

Pu Zhibing

2024-11-15 4506fb4becb6caf6441c86d0085336ef56ab3677

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

@@ -35,4 +35,6 @@

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

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

}