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

tangxiaobao

2021-09-07 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveOperationRecordService.java

@@ -31,10 +31,11 @@
    void addReserveOperationRecord(Long reserveId, Long reserveRecordId, Long userId, Integer type
            , String phone, String reserveContent,String remark,Integer status,Long createBy,Date reserveTime);


    /**
     * 多条件查询操作记录
     * @param operationDetailDTO
     * @return
     */
    R  detailOperationRecord(OperationDetailDTO operationDetailDTO);
    R detailOperationRecord(OperationDetailDTO operationDetailDTO);
}