update entity

pom.xml

@@ -367,5 +367,10 @@
             <artifactId>aws-java-sdk-s3</artifactId>
             <version>${amazonaws.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.googlecode.aviator</groupId>
+            <artifactId>aviator</artifactId>
+            <version>4.2.0</version>
+        </dependency>
     </dependencies>
 </project>

src/main/java/com/quantgroup/asset/distribution/service/jpa/entity/FundProductEntity.java

@@ -6,22 +6,21 @@ import java.util.Objects;
 
 /**
  * @author shihuajun
- * @date 2021/8/26 17:57
+ * @date 2021/8/30 17:34
  * @ describing
  */
 @Entity
-@Table(name = "fund_product", schema = "asset-distribution")
+@Table(name = "fund_product", schema = "asset-distribution", catalog = "")
 public class FundProductEntity {
     private long id;
     private long fundId;
-    private Long fundProId;
+    private long fundProId;
     private String fundName;
     private String fundType;
     private String orgType;
     private String businessType;
     private String systermType;
     private String basicRule;
-    private String otherRule;
     private String ruleList;
     private Byte enable;
     private Timestamp createdAt;
@@ -49,11 +48,11 @@ public class FundProductEntity {
 
     @Basic
     @Column(name = "fund_pro_id", nullable = false)
-    public Long getFundProId() {
+    public long getFundProId() {
         return fundProId;
     }
 
-    public void setFundProId(Long fundProId) {
+    public void setFundProId(long fundProId) {
         this.fundProId = fundProId;
     }
 
@@ -159,18 +158,14 @@ public class FundProductEntity {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
         FundProductEntity that = (FundProductEntity) o;
-        return id == that.id && fundId == that.fundId && Objects.equals(fundProId,that.fundProId) && Objects.equals(fundName, that.fundName) && Objects.equals(fundType, that.fundType) && Objects.equals(orgType, that.orgType) && Objects.equals(businessType, that.businessType) && Objects.equals(systermType, that.systermType) && Objects.equals(basicRule, that.basicRule) && Objects.equals(otherRule, that.otherRule) && Objects.equals(ruleList, that.ruleList) && Objects.equals(enable, that.enable) && Objects.equals(createdAt, that.createdAt) && Objects.equals(updatedAt, that.updatedAt);
+        return id == that.id && fundId == that.fundId && fundProId == that.fundProId && Objects.equals(fundName, that.fundName) && Objects.equals(fundType, that.fundType) && Objects.equals(orgType, that.orgType) && Objects.equals(businessType, that.businessType) && Objects.equals(systermType, that.systermType) && Objects.equals(basicRule, that.basicRule) && Objects.equals(ruleList, that.ruleList) && Objects.equals(enable, that.enable) && Objects.equals(createdAt, that.createdAt) && Objects.equals(updatedAt, that.updatedAt);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, fundId, fundProId, fundName, fundType, orgType, businessType, systermType, basicRule, otherRule, ruleList, enable, createdAt, updatedAt);
+        return Objects.hash(id, fundId, fundProId, fundName, fundType, orgType, businessType, systermType, basicRule, ruleList, enable, createdAt, updatedAt);
     }
 }

src/main/java/com/quantgroup/asset/distribution/service/jpa/entity/ProductRuleEntity.java

@@ -6,16 +6,17 @@ import java.util.Objects;
 
 /**
  * @author shihuajun
- * @date 2021/8/26 17:57
+ * @date 2021/8/30 17:34
  * @ describing
  */
 @Entity
-@Table(name = "product_rule", schema = "asset-distribution")
+@Table(name = "product_rule", schema = "asset-distribution", catalog = "")
 public class ProductRuleEntity {
     private long id;
     private String ruleName;
-    private String ruleEnglish;
+    private String ruleVal;
     private String ruleChinese;
+    private String textType;
     private Byte enable;
     private Timestamp createdAt;
     private Timestamp updatedAt;
@@ -41,13 +42,13 @@ public class ProductRuleEntity {
     }
 
     @Basic
-    @Column(name = "rule_english", nullable = false, length = 50)
-    public String getRuleEnglish() {
-        return ruleEnglish;
+    @Column(name = "rule_val", nullable = false, length = 50)
+    public String getRuleVal() {
+        return ruleVal;
     }
 
-    public void setRuleEnglish(String ruleEnglish) {
-        this.ruleEnglish = ruleEnglish;
+    public void setRuleVal(String ruleVal) {
+        this.ruleVal = ruleVal;
     }
 
     @Basic
@@ -60,6 +61,16 @@ public class ProductRuleEntity {
         this.ruleChinese = ruleChinese;
     }
 
+    @Basic
+    @Column(name = "text_type", nullable = true, length = 50)
+    public String getTextType() {
+        return textType;
+    }
+
+    public void setTextType(String textType) {
+        this.textType = textType;
+    }
+
     @Basic
     @Column(name = "enable", nullable = true)
     public Byte getEnable() {
@@ -92,18 +103,14 @@ public class ProductRuleEntity {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
         ProductRuleEntity that = (ProductRuleEntity) o;
-        return id == that.id && Objects.equals(ruleName, that.ruleName) && Objects.equals(ruleEnglish, that.ruleEnglish) && Objects.equals(ruleChinese, that.ruleChinese) && Objects.equals(enable, that.enable) && Objects.equals(createdAt, that.createdAt) && Objects.equals(updatedAt, that.updatedAt);
+        return id == that.id && Objects.equals(ruleName, that.ruleName) && Objects.equals(ruleVal, that.ruleVal) && Objects.equals(ruleChinese, that.ruleChinese) && Objects.equals(textType, that.textType) && Objects.equals(enable, that.enable) && Objects.equals(createdAt, that.createdAt) && Objects.equals(updatedAt, that.updatedAt);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, ruleName, ruleEnglish, ruleChinese, enable, createdAt, updatedAt);
+        return Objects.hash(id, ruleName, ruleVal, ruleChinese, textType, enable, createdAt, updatedAt);
     }
 }