Merge branch 'jsxswms' into integrationWms

zhang

4 天以前 af7b9db27bf72c92108329815ec771fb46e5b877

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

@@ -42,7 +42,9 @@
        excludeTrash(param);
        convert(param, wrapper);
        allLike(BasStation.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.ok(basStationService.selectPage(new Page<>(curr, limit), wrapper));
    }

@@ -62,6 +64,10 @@
    @RequestMapping(value = "/basStation/add/auth")
    @ManagerAuth
    public R add(BasStation basStation) {
        basStation.setAppeUser(getUserId());
        basStation.setModiUser(getUserId());
        basStation.setIoTime(new Date());
        basStation.setId(null);
        basStationService.insert(basStation);
        return R.ok();
    }