Merge branch 'hemenkou_dev' into dev

101captain

2022-03-09 f083799fbd6079fc6c88b3848e83c74224cd3015

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

@@ -95,7 +95,7 @@
    public R update(@RequestBody ComActRaffleRecordVO comActRaffleRecordVO) {
        ComActRaffleRecord comActRaffleRecord1=comActRaffleRecordService.getById(comActRaffleRecordVO.getId());
        if(comActRaffleRecord1.getStatus()!=1){
            return R.fail("核销失败");
            return R.ok("核销失败");
        }
        ComActRaffleRecord comActRaffleRecord=new ComActRaffleRecord();
        BeanUtils.copyProperties(comActRaffleRecordVO,comActRaffleRecord);