Merge remote-tracking branch 'origin/master'

Fancy

2024-07-31 27c0c61e48bfb3e870d44b3b53a820568fcce5d5

 pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceProductionLogMapper.java

@@ -22,7 +22,7 @@

    StaDeviceProductionLog selectByPrimaryKey(Long id);

    List<StaDeviceProductionLog> selectByEquipNo(String equipNo);
    List<StaDeviceProductionLog> selectByDeviceNo(String deviceNo);

    int updateByPrimaryKeySelective(StaDeviceProductionLog record);