Merge remote-tracking branch 'origin/master'

Fancy

2024-07-31 27c0c61e48bfb3e870d44b3b53a820568fcce5d5

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

@@ -31,7 +31,6 @@

    int deleteLogicById(Long id);

    @MapKey("id")
    List<Map<String,String>> queryAll(Long proId);

    boolean exists(@Param("name") String name,@Param("id") Long id);