Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/attendance/leave/record/list.vue

@@ -116,7 +116,7 @@ export default {
 
           // {label: "所属部门id", prop: "deptId", formatter: this.formatter},
 
-          { label: "所属部门", prop: "deptName" },
+          { label: "所属部门", prop: "deptId", formatter: this.formatter },
 
           { label: "电话号码", prop: "phoneNumber" },
 

attendance-performance-manager-ui/admin/vue.config.js

@@ -13,7 +13,7 @@ module.exports = {
 	devServer: {
 		inline: true,
 		disableHostCheck: true,
-		port: 8086,
+		port: 8087,
 		hot: true,//自动保存
 		proxy: {
 			'/attendance': {