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