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

Junjie

2023-11-10 578c84810e978be343ef93f214da91c27917eef1

 src/main/java/com/zy/crm/manager/mapper/PlanMapper.java

@@ -24,6 +24,6 @@

    Plan selectPlanByNewestUuid(@Param("hostId") Long hostId);

    List<Plan> listByPage(Page<Plan> page, @Param("hostId")Long hostId, @Param("deptId") String deptId, @Param("userId") Long userId , @Param("condition") String condition);
    List<Plan> listByPage(Page<Plan> page, @Param("hostId")Long hostId, @Param("deptId") String deptId, @Param("userId") Long userId ,@Param("director")Long director, @Param("condition") String condition);

}