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

luodangjia

2024-07-22 f9fff682ff6b21344401bb86f85d25c97c37b073

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemPriceServiceImpl.java

@@ -25,4 +25,8 @@
    public List<Map<String, Object>> getSpecialPriceList(Page<Map<String, Object>> page, Integer companyId, String name, Integer state) {
        return this.baseMapper.getSpecialPriceList(page, companyId, name, state);
    }
    @Override
    public List<Map<String, Object>> getSpecialPriceList1(Page<Map<String, Object>> page, Integer companyId, String name, Integer state) {
        return this.baseMapper.getSpecialPriceList1(page, companyId, name, state);
    }
}