测试git冲突

liurunyu

2023-12-01 43cef17ebd5b267e12fe5aa9c955ef71e9d0f2a4

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