diff --git a/ruoyi-admin/src/main/resources/application-hs.yml b/ruoyi-admin/src/main/resources/application-hs.yml
index 712e10b..27a8a8c 100644
--- a/ruoyi-admin/src/main/resources/application-hs.yml
+++ b/ruoyi-admin/src/main/resources/application-hs.yml
@@ -8,6 +8,7 @@ spring:
master:
#url: jdbc:mysql://localhost:3307/kaohe?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://172.16.9.9:3306/kaohe?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ #url: jdbc:mysql://172.16.9.9:3306/kaohetest?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: ruanfa
#password: hs123456
diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/Bkhdx.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/Bkhdx.java
index 7b3e2b3..c577f41 100644
--- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/Bkhdx.java
+++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/Bkhdx.java
@@ -30,6 +30,34 @@ public class Bkhdx extends BaseEntity {
@Excel(name = "被考核对象类型")
private String bkhdxType;*/
+ /**
+ * 工号
+ */
+ @Excel(name = "*工号")
+ private String wordId;
+
+ /**
+ * 职位
+ */
+ @Excel(name = "职位")
+ private String position;
+
+ public String getWordId() {
+ return wordId;
+ }
+
+ public void setWordId(String wordId) {
+ this.wordId = wordId;
+ }
+
+ public String getPosition() {
+ return position;
+ }
+
+ public void setPosition(String position) {
+ this.position = position;
+ }
+
public Long getBkhdxId() {
return bkhdxId;
}
diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhPingceMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhPingceMapper.xml
index 18f9669..0d97920 100644
--- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhPingceMapper.xml
+++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhPingceMapper.xml
@@ -33,6 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -52,9 +54,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"