Merge remote-tracking branch 'origin/master'

ant-design-vue-jeecg/src/views/fieldx/FieldxList.vue

@@ -248,6 +248,7 @@
           column: 'createTime',
           order: 'asc',
         },
+          tableName:'',
 
       }
     },
@@ -290,10 +291,11 @@
       //新增触发事件
       added(event) {
         const {type, row, column, value, target} = event
-        this.tableid = this.model.id
+          console.log(event,"-------")
+
         target.setValues([{
           rowKey: row.id,
-          values: {tableId_dictText: this.model.tableName}
+          values: {tableId_dictText: this.tableName}
         }])
       },
       //数据发生变化时事件 即 编辑 时同步保存
@@ -342,6 +344,7 @@
         //console.log(topicid);
         this.queryParam.tableId = this.model.id;
         this.tableid = this.model.id
+          this.tableName=this.model.tableName;
         //console.log(this.queryParam.topicid);
         this.loadData();
       },

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/functionx/entity/Functionx.java

@@ -88,8 +88,8 @@ public class Functionx implements Serializable {
     @ApiModelProperty(value = "用户角色")
     private java.lang.String userRole;
 	/**责任人*/
-	@Excel(name = "责任人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
-	@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
+	@Excel(name = "责任人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id")
+	@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
     @ApiModelProperty(value = "责任人")
     private java.lang.String managerUsers;
 	/**任务等级*/