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

xuhy

2024-02-06 29d330f60667cb479058cd640049dd6720eb5c87

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

}