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

Pu Zhibing

2024-10-10 ad79642adf7d56b1c54898ce971a976683a88dd3

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

}