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

101captain

2021-08-30 92c10b930728ce39682c5aa83ab2695567290ebd

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

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveOperationRecordService.java

 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);
}