|
@@ -47,17 +47,10 @@ exports.XlsBack = {
|
|
|
info: [["ConfProxy", "id"]],
|
|
info: [["ConfProxy", "id"]],
|
|
|
},
|
|
},
|
|
|
task: {
|
|
task: {
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
- desc: [["ConfProxy", "id"]],
|
|
|
|
|
- main: [["ConfProxy", "id"]],
|
|
|
|
|
-=======
|
|
|
|
|
desc: [["ConfProxy", "kind"]],
|
|
desc: [["ConfProxy", "kind"]],
|
|
|
main: [
|
|
main: [
|
|
|
["ConfProxy", "id"],
|
|
["ConfProxy", "id"],
|
|
|
["mainByNextid", "ConfProxy", "nextid"],
|
|
["mainByNextid", "ConfProxy", "nextid"],
|
|
|
],
|
|
],
|
|
|
->>>>>>> 9bcbc83 (任务表配置)
|
|
|
|
|
},
|
|
},
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
};
|
|
};
|
