Merge remote-tracking branch 'origin/master'

zss

2024-06-28 c3e4a95cc4ada32b0ac7f14fcd5469bd1bbd1c09

 cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java

@@ -348,6 +348,12 @@
                    }
                } catch (Exception e) {
                }
                try {
                    if (list1.get(24) != null) {
                        str.setLaboratory(list1.get(24) + "");
                    }
                } catch (Exception e) {
                }
                lists.add(str);
            }
        });