From d99a56e37cf9109b46ee68d34a06594ef5615ed3 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 10 十一月 2022 16:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerVO.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerVO.java
index 474063e..978687a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/civil/ComActSocialWorkerVO.java
@@ -63,7 +63,7 @@
* 分类id
*/
@ApiModelProperty(value = "分类id")
- private Long skillType;
+ private String skillType;
/**
* 入职时间
@@ -109,5 +109,11 @@
private Integer credential;
@ApiModelProperty(value = "分类名称")
- private String skillName;
+ private String skillTypeName;
+
+ @ApiModelProperty(value = "年龄")
+ private Integer age;
+
+ @ApiModelProperty(value = "社区名字")
+ private String communityName;
}
--
Gitblit v1.7.1