Merge branch 'jsxswms' into integrationWms

zhang

4 天以前 af7b9db27bf72c92108329815ec771fb46e5b877

 src/main/java/com/zy/asrs/controller/BasStationController.java

@@ -67,7 +67,7 @@
        basStation.setAppeUser(getUserId());
        basStation.setModiUser(getUserId());
        basStation.setIoTime(new Date());

        basStation.setId(null);
        basStationService.insert(basStation);
        return R.ok();
    }