Merge branch 'master' of http://120.76.47.59:3000/liu_li/yxk_StoreroomSystem into master

archives/src/main/java/com/storeroom/modules/dictionary/domain/ArchivesDictionary.java

@@ -8,6 +8,7 @@ import lombok.Setter;
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.List;
 import java.util.Objects;
 
 @Entity
@@ -24,6 +25,12 @@ public class ArchivesDictionary extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "ID", hidden = true)
     private String id;
 
+//    @OneToMany(mappedBy = "",cascade = {CascadeType.PERSIST,CascadeType.REMOVE})
+//    private List<Category> category_id;
+
+    @OneToMany(mappedBy = "archivesDictionary",cascade = {CascadeType.PERSIST,CascadeType.REMOVE})
+    private List<Dictionary> sysDictionaryId;
+
     @ApiModelProperty(value = "字段名称")
     @Column(name = "field_name")
     private String fieldName;

archives/src/main/java/com/storeroom/modules/dictionary/domain/Dictionary.java

@@ -26,6 +26,15 @@ public class Dictionary extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "名称")
     private String dicName;
 
+    /**
+     * 关联门类字典表  N:1
+     *
+     */
+    @JoinColumn(name = "id")
+    @ManyToOne(fetch = FetchType.LAZY)
+    @ApiModelProperty(value = "门类字典")
+    private ArchivesDictionary archivesDictionary;
+
     @Column(name = "dic_code")
     @ApiModelProperty(value = "代码")
     private String dicCode;