From 0a4cf022df96f40a271132c9c973250c271f5fea Mon Sep 17 00:00:00 2001 From: zhangyue Date: Fri, 7 Nov 2025 09:28:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/zcloud/basic/info/dto/UserAddCmd.java | 8 ++++---- .../java/com/zcloud/basic/info/dto/UserUpdateCmd.java | 8 ++++---- .../java/com/zcloud/basic/info/dto/UserXgfAddCmd.java | 8 ++++---- .../com/zcloud/basic/info/dto/clientobject/UserCO.java | 4 ++-- .../java/com/zcloud/basic/info/domain/model/UserE.java | 4 ++-- .../zcloud/basic/info/persistence/dataobject/UserDO.java | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java index ca76698..ba6ef0c 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserAddCmd.java @@ -85,10 +85,10 @@ public class UserAddCmd extends Command { @ApiModelProperty(value = "户口所在地", name = "locationAddress") private String locationAddress; - @ApiModelProperty(value = "职级", name = "rank_level") - private String rank_level; - @ApiModelProperty(value = "职级名称", name = "rank_level_name") - private String rank_level_name; + @ApiModelProperty(value = "职级", name = "rankLevel") + private String rankLevel; + @ApiModelProperty(value = "职级名称", name = "rankLevelName") + private String rankLevelName; // TODO 待确认企业端和监管端是否必填 @ApiModelProperty(value = "人员在部门中的排序", name = "sort") diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java index ae8878f..167a9bf 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserUpdateCmd.java @@ -63,10 +63,10 @@ public class UserUpdateCmd extends Command { private String locationAddress; @ApiModelProperty(value = "手机号", name = "phone") private String phone; - @ApiModelProperty(value = "职级", name = "rank_level") - private String rank_level; - @ApiModelProperty(value = "职级名称", name = "rank_level_name") - private String rank_level_name; + @ApiModelProperty(value = "职级", name = "rankLevel") + private String rankLevel; + @ApiModelProperty(value = "职级名称", name = "rankLevelName") + private String rankLevelName; @ApiModelProperty(value = "人员在部门中的排序", name = "sort") private Integer sort; @ApiModelProperty(value = "描述", name = "remarks") diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java index 80ae8d7..0694240 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserXgfAddCmd.java @@ -88,10 +88,10 @@ public class UserXgfAddCmd extends Command { @ApiModelProperty(value = "户口所在地", name = "locationAddress", required = true) @NotEmpty(message = "户口所在地不能为空") private String locationAddress; - @ApiModelProperty(value = "职级", name = "rank_level") - private String rank_level; - @ApiModelProperty(value = "职级名称", name = "rank_level_name") - private String rank_level_name; + @ApiModelProperty(value = "职级", name = "rankLevel") + private String rankLevel; + @ApiModelProperty(value = "职级名称", name = "rankLevelName") + private String rankLevelName; @ApiModelProperty(value = "人员在部门中的排序", name = "sort") private Integer sort; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java index 3757d20..755a210 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java @@ -94,9 +94,9 @@ public class UserCO extends ClientObject { private String locationAddress; @ApiModelProperty(value = "职级") - private String rank_level; + private String rankLevel; @ApiModelProperty(value = "职级名称") - private String rank_level_name; + private String rankLevelName; @ApiModelProperty(value = "手机号") private String phone; //人员在部门中的排序 diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java index 2bef68a..24e3e3e 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java @@ -59,10 +59,10 @@ public class UserE extends BaseE { //户口所在地 private String locationAddress; - private String rank_level; + private String rankLevel; private String phone; - private String rank_level_name; + private String rankLevelName; //人员在部门中的排序 private Integer sort; //乐观锁 diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java index 1bd497a..c3c90d3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/UserDO.java @@ -89,9 +89,9 @@ public class UserDO extends BaseDO { @ApiModelProperty(value = "户口所在地") private String locationAddress; @ApiModelProperty(value = "职级") - private String rank_level; + private String rankLevel; @ApiModelProperty(value = "职级名称") - private String rank_level_name; + private String rankLevelName; @ApiModelProperty(value = "手机号") private String phone; //人员在部门中的排序