Merge remote-tracking branch 'origin/master'

zhoushihao

2024-07-16 353acdfceab45a94d9f5d71e353bd06bf7c2eba6

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java

@@ -24,13 +24,13 @@
       */
      void saveGlassInfo(List<GlassInfo> glassinfo);

      int getGlassInfoCountByFlowCardId(String flowCardId);
//      int getGlassInfoCountByFlowCardId(String flowCardId,int layer);

      /**
       * @return
       * 查询所有工程状态不为300不同流程卡号
       */
      List<Map<String, Object>> getFlowCardId();
//      List<Map<String, Object>> getFlowCardId();