Merge remote-tracking branch 'origin/jsxswms' into jsxswms

zhou zhou

2 天以前 92ff7ea27e6f99c004c727d471f2f3d82c1c3a30

 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();
    }