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

zjj

2025-05-30 8233002dffa7ae961c6115ba8e47138d3ddefb3e

 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)) {