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

zhanghl

2025-05-20 fa1a70790ff7fd4df4ab114f56bee9476128152e

 aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java

@@ -74,7 +74,7 @@
     */
    public List<ApsPlatePlan> selectPlateRedundantOrderList(ApsPlatePlan apsPlatePlan);

    List<ApsPlatePlan> selectPlatePlanByPlantMajor(String plant,String professionalAffiliation);
    List<ApsPlatePlan> selectPlatePlanByPlantMajor(String plant);

    /**
     * 获取一条未匹配的子计划