测试git冲突

liurunyu

2023-12-01 88cd0922634e6bb20da6ea64209bd62d094b6b4c

1
2
3
4
5
6
package com.dy.aceMw.server.rtuData;
 
public class TreeConfig {
    public TaskConfig taskConf ;
    public TreeConfig[] subTreeConfs ;//所有子节点
}