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

无关风月

8 天以前 4f5d220cd175b1cb48c6fc91cb02cb12f6114746

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

@@ -141,8 +141,8 @@
    }

    @Override
    public List<Map<String, Object>> listRecord(Page<Object> objectPage, Integer id, List<Integer> ids, Integer type) {
        return this.baseMapper.listRecord(objectPage, id, ids, type);
    public List<Map<String, Object>> listRecord(Integer id, List<Integer> ids, Integer type) {
        return this.baseMapper.listRecord(id, ids, type);
    }

    @Override