From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerAddDTO.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerAddDTO.java
index 102ad72..79ad4d4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerAddDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/civil/ComActSocialWorkerAddDTO.java
@@ -65,7 +65,13 @@
* 分类id
*/
@ApiModelProperty(value = "分类id")
- private Long skillType;
+ private String skillType;
+
+ /**
+ * 分类名称
+ */
+ @ApiModelProperty(value = "分类名称")
+ private String skillTypeName;
/**
* 入职时间
@@ -109,4 +115,10 @@
@ApiModelProperty(value = "是否证件 0否 1是")
private Integer credential;
+ /**
+ * 年龄
+ */
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
}
--
Gitblit v1.7.1