融合代码 提交本地

src/main/java/com/nis/domain/basics/ServiceDictInfo.java

@@ -32,7 +32,7 @@ public class ServiceDictInfo extends BaseEntity<ServiceDictInfo>{
 	private SysUser serviceDictEditor; //editor_id	修改人员	int	Y	取自sys_user.id
 	private Date editTime; //edit_time	修改时间	date	Y	
 	private Integer levelNo; //层级
-	private List<ServiceDictInfo> ChildrenList = new ArrayList<ServiceDictInfo>();//子列表
+	private List<ServiceDictInfo> childrenList = new ArrayList<ServiceDictInfo>();//子列表
 	
     private Date beginDate;		// 开始日期
 	private Date endDate;		// 结束日期
@@ -123,11 +123,11 @@ public class ServiceDictInfo extends BaseEntity<ServiceDictInfo>{
 	public void setEditTime(Date editTime) {
 		this.editTime = editTime;
 	}
-    public List<ServiceDictInfo> getChildrenList() {
-		return ChildrenList;
+	public List<ServiceDictInfo> getChildrenList() {
+		return childrenList;
 	}
 	public void setChildrenList(List<ServiceDictInfo> childrenList) {
-		ChildrenList = childrenList;
+		this.childrenList = childrenList;
 	}
 	public Date getBeginDate() {
 		return beginDate;