Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

9 天以前 1de6b39bfe3967916dcab8122be0d69fbaba8cca

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java

@@ -114,7 +114,6 @@
        if (Objects.isNull(companys.getType())) {
            throw new CoolException("类型不能为空！！");
        }

        companys.setUpdateTime(null);
        companys.setUpdateBy(getLoginUserId());
        if (!companysService.updateById(companys)) {