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

廖井涛

13 小时以前 f7a2fcdda7f1120498c5c5f75c5a99955fc54b43

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

@@ -141,7 +141,9 @@
            basicData.setBasicType(basicTypeList.get(0));
            basicData.setBasicCategory(basicTypeList.get(1));
            basicData.setBasicName(map.get("input").toString());
            basicData.setNickname(map.get("nickname").toString());
            if(map.get("nickname")!=null){
                basicData.setNickname(map.get("nickname").toString());
            }
            basicData.setSort(maxSort+1);
            basicDataMapper.insert(basicData);
        }