简历解析结构修改和字典逻辑修改

vetti-common/src/main/java/com/vetti/common/core/domain/entity/SysDictData.java

@@ -4,6 +4,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 
 import com.vetti.common.international.International;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.vetti.common.annotation.Excel;
@@ -11,6 +12,8 @@ import com.vetti.common.annotation.Excel.ColumnType;
 import com.vetti.common.constant.UserConstants;
 import com.vetti.common.core.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 字典数据表 sys_dict_data
  * 
@@ -21,40 +24,52 @@ public class SysDictData extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 字典编码 */
+    @ApiModelProperty("字典编码")
     @Excel(name = "字典编码", cellType = ColumnType.NUMERIC)
     private Long dictCode;
 
+    /** 字典编码 */
+    @ApiModelProperty("字典父编码")
+    @Excel(name = "字典父编码", cellType = ColumnType.NUMERIC)
+    private Long dictParentCode;
+
     /** 字典排序 */
+    @ApiModelProperty("字典排序")
     @Excel(name = "字典排序", cellType = ColumnType.NUMERIC)
     private Long dictSort;
 
     /** 字典标签 */
+    @ApiModelProperty("字典标签")
     @Excel(name = "字典标签")
-    @International(type = "sys_dict_label")
     private String dictLabel;
 
     /** 字典键值 */
+    @ApiModelProperty("字典键值")
     @Excel(name = "字典键值")
     private String dictValue;
 
     /** 字典类型 */
+    @ApiModelProperty("字典类型")
     @Excel(name = "字典类型")
     private String dictType;
 
-    /** 样式属性（其他样式扩展） */
+    @ApiModelProperty("样式属性（其他样式扩展)")
     private String cssClass;
 
-    /** 表格字典样式 */
+    @ApiModelProperty("表格字典样式")
     private String listClass;
 
-    /** 是否默认（Y是 N否） */
+    @ApiModelProperty("是否默认（Y是 N否）")
     @Excel(name = "是否默认", readConverterExp = "Y=是,N=否")
     private String isDefault;
 
-    /** 状态（0正常 1停用） */
+    @ApiModelProperty("状态（0正常 1停用）")
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
+    @ApiModelProperty("字典子类集合")
+    private List<SysDictData> childrenDictData;
+
     public Long getDictCode()
     {
         return dictCode;
@@ -65,6 +80,14 @@ public class SysDictData extends BaseEntity
         this.dictCode = dictCode;
     }
 
+    public Long getDictParentCode() {
+        return dictParentCode;
+    }
+
+    public void setDictParentCode(Long dictParentCode) {
+        this.dictParentCode = dictParentCode;
+    }
+
     public Long getDictSort()
     {
         return dictSort;
@@ -156,7 +179,16 @@ public class SysDictData extends BaseEntity
     {
         this.status = status;
     }
-    
+
+
+    public List<SysDictData> getChildrenDictData() {
+        return childrenDictData;
+    }
+
+    public void setChildrenDictData(List<SysDictData> childrenDictData) {
+        this.childrenDictData = childrenDictData;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)