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

zhanghl

2025-05-16 c3c7756721b8b29585615f6d2c6cb6166f17c7cc

 aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlatePlanService.java

@@ -2,7 +2,6 @@

import com.aps.core.domain.ApsPlatePlan;
import com.aps.core.domain.ApsPlatePlanTemp;
import com.aps.core.domain.ApsPlateStandardRequire;

import java.util.Hashtable;
import java.util.List;
@@ -85,4 +84,6 @@
    ApsPlatePlan selectUnMatchPlateSubPlan(String plant, String itemNumber, Hashtable<String, List<ApsPlatePlan>> subPlans);

    // ApsPlatePlan selectUnMatchPlateSubPlan(ApsPlateStandardRequire require);

    boolean setSubPlansToRedis();
}