冲突解决

ruoyi-ui/src/views/tableMange/index.vue

@@ -1565,10 +1565,7 @@ export default {
           //   this.$message.error("请补全关联条件");
           //   return;
           // }
-<<<<<<< HEAD
           // console.log("123", columns);
-=======
->>>>>>> 0b02a879572de5f5533cacbfea997e10bc594762
           this.uuid = uuidv4();
           this.tableKey = uuidv4();
           // 表单

ruoyi-ui/src/views/tablelist/commonTable/listInfo.vue

@@ -453,7 +453,6 @@ export default {
 
           // 查询统计信息
           getStatisticList({
-<<<<<<< HEAD
             queryMap: {
               tableKey: this.templateInfo.template.tableKey,
               queryCriteriaValue: this.queryParams.queryMap.queryCriteriaValue
@@ -462,12 +461,6 @@ export default {
             // console.log('getStatisticList', res);
             this.statisticList = res.data
           })
-=======
-            queryMap: { tableKey: this.templateInfo.template.tableKey },
-          }).then((res) => {
-            this.statisticList = res.data;
-          });
->>>>>>> 0b02a879572de5f5533cacbfea997e10bc594762
         });
     },
     isUpperCase(char) {