Merge remote-tracking branch 'origin/master'

zss

2024-07-15 7f5af45919cbda45e8be3b82d613708fad93718b

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

@@ -340,14 +340,18 @@
                    str.setTemplateId(null);
                }
                try {
                    if (list1.get(22) != null) {
                    if (list1.get(22) != null && list1.get(22) != "") {
                        str.setInspectionItemClass(list1.get(22) + "");
                    } else {
                        str.setInspectionItemClass(null);
                    }
                } catch (Exception e) {
                }
                try {
                    if (list1.get(23) != null) {
                    if (list1.get(23) != null && list1.get(23) != "") {
                        str.setInspectionItemClassEn(list1.get(23) + "");
                    } else {
                        str.setInspectionItemClassEn(null);
                    }
                } catch (Exception e) {
                }