花城-智慧社区
parent: 3d2dccde | 补丁 | 提交 | show whitespace
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
1个文件已修改
1 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveOperationRecordService.java 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveOperationRecordService.java


@@ -31,6 +31,7 @@


    void addReserveOperationRecord(Long reserveId, Long reserveRecordId, Long userId, Integer type


            , String phone, String reserveContent,String remark,Integer status,Long createBy,Date reserveTime);






    /**


     * 多条件查询操作记录


     * @param operationDetailDTO