Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

廖井涛

2024-05-11 91f291a2c3b4e41fc0b44f2395ad5c956803ee8c

 north-glass-erp/src/main/java/com/example/erp/service/sd/BasicGlassTypeService.java

@@ -35,7 +35,7 @@
            for (BasicGlassType basicGlassType : twoGlassType) {
                if (Objects.equals(basicGlassType.getBelong(), glassType.getTypeId())) {
                    Map<String,String> getMap = JSON.parseObject(JSON.toJSONString(basicGlassType), Map.class);
                    getMap.put("value",getMap.get("typeID"));
                    getMap.put("value",getMap.get("typeId"));
                    getMap.put("label",getMap.get("typeName"));
                    equalList.add(JSON.toJSONString(getMap)   );
                }