Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-10-07 78a4df6ad36a5cdf18d40ef539e0ce9609c71b4f

 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/PointsMerchandiseServiceImpl.java

@@ -28,6 +28,12 @@
                ofSearch.getUserPopulation(),ofSearch.getActiveStatus(),ofSearch.getState(),ofSearch.getPage());
    }


    @Override
    public void saveCity(Integer id, String province, String provinceCode, String city, String cityCode) {
        this.baseMapper.saveCity(id,province,provinceCode,city,cityCode);
    }

    @Override
    public List<Map<String, Object>> ticketList(IntegralGoodsOfSearch ofSearch) {
        return this.baseMapper.ticketList(ofSearch);