Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0

mitao

2025-03-18 d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256

 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -320,6 +320,13 @@
        {
            return error("账户不能为空");
        }

        if(StringUtils.isEmpty(config.getDepartmentId()))
        {
           return error("请选择部门");
        }

        config.setMoreDepartmentIds(config.getDepartmentId());
        config.setPassword(null);
        config.setUpdateBy(sys.getUserId()+"");