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

Junjie

2023-11-08 7f9d058a0e632be6a3daf6f46d26b69742db0720

 src/main/java/com/zy/crm/manager/service/PlanService.java

@@ -17,6 +17,6 @@

    String getUuid(Long hostId);

    Page<Plan> getPage(Page<Plan> page, Long hostId, String deptId, Long userId, String condition);
    Page<Plan> getPage(Page<Plan> page, Long hostId, String deptId, Long userId,Long direcote, String condition);

}