Merge remote-tracking branch 'origin/test' into test

src/main/java/com/uas/credit/model/corpcreditinfo/CorpBaseNationalInfoItem.java

@@ -20,6 +20,7 @@ public class CorpBaseNationalInfoItem implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id", length = 20)
     private Long id;
 

src/main/java/com/uas/credit/model/corpcreditinfo/CorpTopManagerInfoItem.java

@@ -20,6 +20,7 @@ public class CorpTopManagerInfoItem implements Serializable{
 
 
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     private Long id;
 

src/main/java/com/uas/credit/model/corpcreditinfo/FrOtherCorpTopManagerInfoItem.java

@@ -19,6 +19,7 @@ public class FrOtherCorpTopManagerInfoItem implements Serializable{
 
 
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id", length = 40)
     private Long id;
 

src/main/java/com/uas/credit/model/corpcreditinfo/ManageContactInfosItem.java

@@ -19,6 +19,7 @@ public class ManageContactInfosItem implements Serializable{
     private static final long serialVersionUID = 1L;
 
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id", length = 40)
     private Long id;
 

src/main/java/com/uas/credit/model/corpcreditinfo/NationalCorpOtherShareholderInfoItem.java

@@ -18,6 +18,7 @@ public class NationalCorpOtherShareholderInfoItem {
 
 
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id", length = 40)
     private Long id;
 

src/main/java/com/uas/credit/model/corpcreditinfo/NationalCorpShareholderInfoItem.java

@@ -17,6 +17,7 @@ public class NationalCorpShareholderInfoItem {
     private static final long serialVersionUID = 1L;
 
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     private Long id;
 

src/main/java/com/uas/credit/model/corpcreditinfo/NationalFrOtherCorpShareholderInfoItem.java

@@ -17,6 +17,7 @@ public class NationalFrOtherCorpShareholderInfoItem {
     private static final long serialVersionUID = 1L;
 
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id", length = 40)
     private Long id;
 

src/main/java/com/uas/credit/model/debtinfo/Endeptinfo.java

@@ -18,6 +18,8 @@ public class Endeptinfo implements Serializable {
     @Column(name = "id")
     private Long id;
 
+
+
     @ManyToOne(cascade = CascadeType.PERSIST)
     private EndeptinfoReport endeptinfoReport;
 

src/main/java/com/uas/credit/model/personCorporation/NationalPersonShareholderReport.java

@@ -61,6 +61,9 @@ public class NationalPersonShareholderReport implements Serializable {
     @JoinColumn(name = "psi_id")
     private List<NationalPersonShareholderReportItem> items;
 
+    @OneToOne(cascade = {CascadeType.PERSIST})
+    private CorporationInfo corporationInfo;
+
     public Long getId() {
         return id;
     }
@@ -116,4 +119,12 @@ public class NationalPersonShareholderReport implements Serializable {
     public void setItems(List<NationalPersonShareholderReportItem> items) {
         this.items = items;
     }
+
+    public CorporationInfo getCorporationInfo() {
+        return corporationInfo;
+    }
+
+    public void setCorporationInfo(CorporationInfo corporationInfo) {
+        this.corporationInfo = corporationInfo;
+    }
 }

src/main/java/com/uas/credit/model/personCorporation/PersonCorporationReport.java

@@ -38,6 +38,8 @@ public class PersonCorporationReport implements Serializable {
     private PersonCorporationRoot personCorporationRoot;
 
 
+
+
     public String getReceiveTime() {
         return receiveTime;
     }

src/main/java/com/uas/credit/model/personCorporation/PersonTopManagerInfo.java

@@ -60,6 +60,9 @@ public class PersonTopManagerInfo implements Serializable {
     @JoinColumn(name = "pm_id")
     private List<PersonTopManagerInfoItem> items;
 
+    @OneToOne(cascade = {CascadeType.PERSIST})
+    private CorporationInfo corporationInfo;
+
     public Long getId() {
         return id;
     }
@@ -115,4 +118,12 @@ public class PersonTopManagerInfo implements Serializable {
     public void setItems(List<PersonTopManagerInfoItem> items) {
         this.items = items;
     }
+
+    public CorporationInfo getCorporationInfo() {
+        return corporationInfo;
+    }
+
+    public void setCorporationInfo(CorporationInfo corporationInfo) {
+        this.corporationInfo = corporationInfo;
+    }
 }

src/main/java/com/uas/credit/model/personal/ArtificialNationalInfoItem.java

@@ -21,6 +21,7 @@ public class ArtificialNationalInfoItem implements Serializable {
 
 
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     private Long id;
 

src/main/java/com/uas/credit/model/personal/NationalPersonShareholderReportItem.java

@@ -21,6 +21,7 @@ public class NationalPersonShareholderReportItem implements Serializable {
 
 
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     private Long id;
 

src/main/java/com/uas/credit/model/personal/PersonTopManagerInfoItem.java

@@ -20,6 +20,7 @@ public class PersonTopManagerInfoItem implements Serializable{
     private static final long serialVersionUID = 1L;
 
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     private Long id;
 

src/main/java/com/uas/credit/model/personal/PoliceCheckInfoItem.java

@@ -18,6 +18,7 @@ public class PoliceCheckInfoItem implements Serializable{
     private static final long serialVersionUID = 1L;
 
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     private Long id;
     /**