Merge remote-tracking branch 'origin/master'

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

@@ -328,7 +328,7 @@
             rowKey: row.id,
             values: {associateField: ''}
           }])
-          target.$refs.vxe.columns[11].options = []
+          target.$refs.vxe.columns[12].options = []
 
           // 调用接口，向选项中传值
             if(tableId!=null){
@@ -336,7 +336,7 @@
             if (res.success) {
               this.fieldxList = res.result.records || res.result;
               // 从2开始
-              target.$refs.vxe.columns[11].options = this.fieldxList;
+              target.$refs.vxe.columns[12].options = this.fieldxList;
             } else {
               this.$message.warning(res.message)
             }