Merge remote-tracking branch 'origin/master'

Administrator

2025-05-22 263c8ee4f6f8cbb1228a1d5c13258ea8d4309350

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrAssemblyPlanMapper.java

@@ -43,6 +43,8 @@

    List<JSONObject> selectByPlanName(@Param("planName") String planName);

    PrAssemblyPlan selectByBatchId(@Param("batchId") Long batchId);

    List<JSONObject> queryPlanList();

    List<PrAssemblyPlan> selectAssyPlanList(PrAssemblyPlan params);