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

huanghongfa

2021-09-02 7f6737cea2a64ca4dd852e5f3e13b5dcd6299859

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java

@@ -76,6 +76,7 @@
                    comActReserveDO.setJoinCount(joinCount != null ? joinCount - 1 : 0);
                    comActReserveMapper.updateById(comActReserveDO);
                    ComActReserveOperationRecordDO comActReserveOperationRecordDO=new ComActReserveOperationRecordDO();
                    comActReserveOperationRecordDO.setRemark(comActReserveRecord.getContent());
                    comActReserveOperationRecordDO.setReserveId(comActReserveRecordDO.getReserveId());
                    comActReserveOperationRecordDO.setReserveRecordId(comActReserveRecordDO.getId());
                    comActReserveOperationRecordDO.setType(ComActReserveOperationRecordDO.type.br);