Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

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

@@ -44,7 +44,15 @@
                                       @RequestParam(value = "actityBeginTime", required = false) Date actityBeginTime,
                                       @RequestParam(value = "actityEndTime", required = false) Date actityEndTime)
    {
        if(StringUtils.isEmpty(acState))
        {
            acState=null;
        }

        if(StringUtils.isEmpty(acType))
        {
            acType=null;
        }
        return R.ok(volunteerActivityService.queryList(pageNum,  pageSize, name, acState, acType,getUserId()+"", actityBeginTime, actityEndTime));
    }