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

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java

@@ -157,14 +157,8 @@
        log.info("==============分页参数"+comEventVO);
        Page pagination = new Page(pageNo, pageSize);
        ComEvent comEvent = CopyUtil.copyProperties(comEventVO, ComEvent.class);
        if (isNull(comEventVO.getUserType())){
            comEvent.setUserType(comEventVO.getUsertype());
        }
        return comEventService.pageByComEvent(comEvent, pagination,this.getLoginUserInfo());
    }





    /**