Merge remote-tracking branch 'origin/master'

zhoushihao

2024-07-11 df4da61f98f4d81f84e2975313b2528e978123cf

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java

@@ -98,7 +98,7 @@
    @Test
    public void testupdateFlowCardIdAndCount() {
        log.info("绑定流程卡号和数量");
        downWorkstationServiceImpl.updateFlowCardIdAndCount("1", 1, 1,0);
        downWorkstationServiceImpl.updateFlowCardIdAndCount("NG24060401A020", 1, 2);

    }