From 75ac3d5acdd448f063a3c307b4c733e37b4fc04f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 08 二月 2025 18:17:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/service/src/main/java/com/doumee/dao/system/dto/CreateCompanyUserDTO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/system/dto/CreateCompanyUserDTO.java b/server/service/src/main/java/com/doumee/dao/system/dto/CreateCompanyUserDTO.java
index cb92ac7..d8b7ef9 100644
--- a/server/service/src/main/java/com/doumee/dao/system/dto/CreateCompanyUserDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/system/dto/CreateCompanyUserDTO.java
@@ -16,7 +16,7 @@
 
 
     @ApiModelProperty(value = "鐢ㄦ埛涓婚敭", example = "1")
-    private Integer userId;
+    private Integer id;
 
     @ApiModelProperty(value = "璐﹀彿", example = "1")
     private String userName;

--
Gitblit v1.9.3