Merge remote-tracking branch 'origin/master'

“zhuo”

2023-08-10 cf347859a3a023f48bdb82e7702c0df8858759db

 inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java

@@ -10,5 +10,5 @@
     * 查询检验计划
     * @return
     */
    List<PlanVo> selectAllPlan(Integer deviceId, Date beginTime, Date endTime, Integer userId);
    List<PlanVo> selectAllPlan(String device, Date beginTime, Date endTime, String user);
}