Merge remote-tracking branch 'origin/master'

zhoushihao

2024-08-08 c2afbe870b5020da259b7b17c734df11106e1dd2

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java

@@ -34,7 +34,7 @@
     * 增加人工输入的工位玻璃信息
     * @param upwork
     */
    void updateGlassMessage(UpWorkstation upwork);
    Boolean updateGlassMessage(UpWorkstation upwork);


    String updateMesInkageLoad(short inKageWord);