Merge remote-tracking branch 'origin/v2.0.1' into dev

src/main/java/com/tanpu/fund/entity/generator/CompanyTnaPersonnel.java

@@ -25,67 +25,68 @@ import lombok.NoArgsConstructor;
  * <p>
  * @email: zhoupeng_08@163.com
  */
+
 /**
-    * 公司管理资产及人员变动统计
-    */
+ * 公司管理资产及人员变动统计
+ */
 @Data
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
 public class CompanyTnaPersonnel {
     /**
-    * 主键ID
-    */
+     * 主键ID
+     */
     private String id;
 
     /**
-    * 公司id
-    */
+     * 公司id
+     */
     private String companyId;
 
     /**
-    * 统计日期
-    */
+     * 统计日期
+     */
     private Date statDate;
 
     /**
-    * 信托管理总资产规模，<量纲：亿元>
-    */
+     * 信托管理总资产规模，<量纲：亿元>
+     */
     private BigDecimal trustFundAssetSize;
 
     /**
-    * 专户管理总资产规模，<量纲：亿元>
-    */
+     * 专户管理总资产规模，<量纲：亿元>
+     */
     private BigDecimal specialAccountAssetSize;
 
     /**
-    * 有限合伙管理总资产规模，<量纲：亿元>
-    */
+     * 有限合伙管理总资产规模，<量纲：亿元>
+     */
     private BigDecimal ltdcoFundAssetSize;
 
     /**
-    * 海外基金管理总资产规模，<量纲：亿元>
-    */
+     * 海外基金管理总资产规模，<量纲：亿元>
+     */
     private BigDecimal offshoreFundAssetSize;
 
     /**
-    * 基金总数
-    */
+     * 基金总数
+     */
     private Integer fundNum;
 
     /**
-    * 公司人数
-    */
+     * 公司人数
+     */
     private Integer staffNum;
 
     /**
-    * 投研人员数
-    */
+     * 投研人员数
+     */
     private Integer analystNum;
 
     /**
-    * 管理总资产规模，<量纲：亿元>	
-    */
+     * 管理总资产规模，<量纲：亿元>
+     */
     private BigDecimal totalAssetSize;
 
     private String createBy;

src/main/java/com/tanpu/fund/entity/generator/FundCompanyInfo.java

@@ -6,6 +6,24 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 @Data
 @Builder
 @AllArgsConstructor
@@ -121,6 +139,11 @@ public class FundCompanyInfo {
 
     private String legalOpini;
 
+    /**
+     * 机构id
+     */
+    private String orgId;
+
     private String companyPro;
 
     private String philosopy;

src/main/java/com/tanpu/fund/entity/generator/FundCompanyInfoExample.java

@@ -5,6 +5,24 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 public class FundCompanyInfoExample {
     protected String orderByClause;
 
@@ -3751,6 +3769,76 @@ public class FundCompanyInfoExample {
             addCriterion("legal_opini not between", value1, value2, "legalOpini");
             return (Criteria) this;
         }
+
+        public Criteria andOrgIdIsNull() {
+            addCriterion("org_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNotNull() {
+            addCriterion("org_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdEqualTo(String value) {
+            addCriterion("org_id =", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotEqualTo(String value) {
+            addCriterion("org_id <>", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThan(String value) {
+            addCriterion("org_id >", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThanOrEqualTo(String value) {
+            addCriterion("org_id >=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThan(String value) {
+            addCriterion("org_id <", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThanOrEqualTo(String value) {
+            addCriterion("org_id <=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLike(String value) {
+            addCriterion("org_id like", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotLike(String value) {
+            addCriterion("org_id not like", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIn(List<String> values) {
+            addCriterion("org_id in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotIn(List<String> values) {
+            addCriterion("org_id not in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdBetween(String value1, String value2) {
+            addCriterion("org_id between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotBetween(String value1, String value2) {
+            addCriterion("org_id not between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

src/main/java/com/tanpu/fund/entity/generator/FundCount.java

@@ -7,6 +7,25 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
+
 /**
  * 基金历史业绩
  */

src/main/java/com/tanpu/fund/entity/generator/FundCountExample.java

@@ -6,6 +6,24 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 public class FundCountExample {
     protected String orderByClause;
 

src/main/java/com/tanpu/fund/entity/generator/FundDistribution.java

@@ -8,8 +8,27 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
-    * 基金分红
-    */
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
+
+/**
+ * 基金分红
+ */
 @Data
 @Builder
 @AllArgsConstructor
@@ -18,23 +37,23 @@ public class FundDistribution {
     private String id;
 
     /**
-    * 基金Id
-    */
+     * 基金Id
+     */
     private String fundId;
 
     /**
-    * 分配日期
-    */
+     * 分配日期
+     */
     private Date distributeDate;
 
     /**
-    * 基金分配类型标志：-1-其他，1-分红，2-拆分 3-业绩报酬 -1-其他
-    */
+     * 基金分配类型标志：-1-其他，1-分红，2-拆分 3-业绩报酬 -1-其他
+     */
     private Integer distributeType;
 
     /**
-    * 分红/拆分比例
-    */
+     * 分红/拆分比例
+     */
     private BigDecimal distribution;
 
     private String createBy;

src/main/java/com/tanpu/fund/entity/generator/FundDistributionExample.java

@@ -6,6 +6,24 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 public class FundDistributionExample {
     protected String orderByClause;
 

src/main/java/com/tanpu/fund/entity/generator/FundInfo.java

@@ -6,6 +6,25 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
+
 /**
  * 基金基本信息
  */

src/main/java/com/tanpu/fund/entity/generator/FundInfoCompanyInfo.java

@@ -5,6 +5,24 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 @Data
 @Builder
 @AllArgsConstructor

src/main/java/com/tanpu/fund/entity/generator/FundInfoCompanyInfoExample.java

@@ -3,6 +3,24 @@ package com.tanpu.fund.entity.generator;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 public class FundInfoCompanyInfoExample {
     protected String orderByClause;
 

src/main/java/com/tanpu/fund/entity/generator/FundInfoExample.java

@@ -5,6 +5,24 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 public class FundInfoExample {
     protected String orderByClause;
 

src/main/java/com/tanpu/fund/entity/generator/FundInfoPerformance.java

@@ -7,6 +7,24 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 @Data
 @Builder
 @AllArgsConstructor
@@ -38,10 +56,14 @@ public class FundInfoPerformance {
 
     private BigDecimal ret1m;
 
+    private BigDecimal ret3m;
+
     private BigDecimal ret6m;
 
     private BigDecimal ret1y;
 
+    private BigDecimal retYtd;
+
     private BigDecimal retIncep;
 
     private BigDecimal sharperatioIncep;

src/main/java/com/tanpu/fund/entity/generator/FundInfoPerformanceCompanyView.java

+package com.tanpu.fund.entity.generator;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class FundInfoPerformanceCompanyView {
+    private String id;
+
+    private Integer type;
+
+    private String fundName;
+
+    private String fundShortName;
+
+    private Integer riskLevel;
+
+    private String trustId;
+
+    private BigDecimal netNav;
+
+    private BigDecimal cumulativeNav;
+
+    private Date endDate;
+
+    private Date priceDate;
+
+    private Integer strategy;
+
+    private Integer substrategy;
+
+    private BigDecimal ret1w;
+
+    private BigDecimal ret1m;
+
+    private BigDecimal ret6m;
+
+    private BigDecimal ret1y;
+
+    private BigDecimal ret3m;
+
+    private BigDecimal retYtd;
+
+    private BigDecimal retIncep;
+
+    private BigDecimal sharperatioIncep;
+
+    private BigDecimal sharperatio1y;
+
+    private BigDecimal sharperatio2y;
+
+    private BigDecimal sharperatio3y;
+
+    private BigDecimal sharperatio4y;
+
+    private BigDecimal sharperatio5y;
+
+    private BigDecimal stddev1y;
+
+    private BigDecimal stddev2y;
+
+    private BigDecimal stddev3y;
+
+    private BigDecimal stddev4y;
+
+    private BigDecimal stddev5y;
+
+    private BigDecimal stddevIncep;
+
+    private BigDecimal maxdrawdown1y;
+
+    private BigDecimal maxdrawdown2y;
+
+    private BigDecimal maxdrawdown3y;
+
+    private BigDecimal maxdrawdown4y;
+
+    private BigDecimal maxdrawdown5y;
+
+    private BigDecimal maxdrawdownIncep;
+
+    private String companyId;
+
+    private String companyName;
+}
\ No newline at end of file

src/main/java/com/tanpu/fund/entity/generator/FundInfoPerformanceExample.java

@@ -6,6 +6,24 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 public class FundInfoPerformanceExample {
     protected String orderByClause;
 
@@ -953,6 +971,66 @@ public class FundInfoPerformanceExample {
             return (Criteria) this;
         }
 
+        public Criteria andRet3mIsNull() {
+            addCriterion("ret_3m is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRet3mIsNotNull() {
+            addCriterion("ret_3m is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRet3mEqualTo(BigDecimal value) {
+            addCriterion("ret_3m =", value, "ret3m");
+            return (Criteria) this;
+        }
+
+        public Criteria andRet3mNotEqualTo(BigDecimal value) {
+            addCriterion("ret_3m <>", value, "ret3m");
+            return (Criteria) this;
+        }
+
+        public Criteria andRet3mGreaterThan(BigDecimal value) {
+            addCriterion("ret_3m >", value, "ret3m");
+            return (Criteria) this;
+        }
+
+        public Criteria andRet3mGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("ret_3m >=", value, "ret3m");
+            return (Criteria) this;
+        }
+
+        public Criteria andRet3mLessThan(BigDecimal value) {
+            addCriterion("ret_3m <", value, "ret3m");
+            return (Criteria) this;
+        }
+
+        public Criteria andRet3mLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("ret_3m <=", value, "ret3m");
+            return (Criteria) this;
+        }
+
+        public Criteria andRet3mIn(List<BigDecimal> values) {
+            addCriterion("ret_3m in", values, "ret3m");
+            return (Criteria) this;
+        }
+
+        public Criteria andRet3mNotIn(List<BigDecimal> values) {
+            addCriterion("ret_3m not in", values, "ret3m");
+            return (Criteria) this;
+        }
+
+        public Criteria andRet3mBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ret_3m between", value1, value2, "ret3m");
+            return (Criteria) this;
+        }
+
+        public Criteria andRet3mNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ret_3m not between", value1, value2, "ret3m");
+            return (Criteria) this;
+        }
+
         public Criteria andRet6mIsNull() {
             addCriterion("ret_6m is null");
             return (Criteria) this;
@@ -1073,6 +1151,66 @@ public class FundInfoPerformanceExample {
             return (Criteria) this;
         }
 
+        public Criteria andRetYtdIsNull() {
+            addCriterion("ret_ytd is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetYtdIsNotNull() {
+            addCriterion("ret_ytd is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetYtdEqualTo(BigDecimal value) {
+            addCriterion("ret_ytd =", value, "retYtd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetYtdNotEqualTo(BigDecimal value) {
+            addCriterion("ret_ytd <>", value, "retYtd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetYtdGreaterThan(BigDecimal value) {
+            addCriterion("ret_ytd >", value, "retYtd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetYtdGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("ret_ytd >=", value, "retYtd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetYtdLessThan(BigDecimal value) {
+            addCriterion("ret_ytd <", value, "retYtd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetYtdLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("ret_ytd <=", value, "retYtd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetYtdIn(List<BigDecimal> values) {
+            addCriterion("ret_ytd in", values, "retYtd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetYtdNotIn(List<BigDecimal> values) {
+            addCriterion("ret_ytd not in", values, "retYtd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetYtdBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ret_ytd between", value1, value2, "retYtd");
+            return (Criteria) this;
+        }
+
+        public Criteria andRetYtdNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("ret_ytd not between", value1, value2, "retYtd");
+            return (Criteria) this;
+        }
+
         public Criteria andRetIncepIsNull() {
             addCriterion("ret_incep is null");
             return (Criteria) this;

src/main/java/com/tanpu/fund/entity/generator/FundInfoPerformanceOld.java

+package com.tanpu.fund.entity.generator;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class FundInfoPerformanceOld {
+    private String id;
+
+    private String fundName;
+
+    private String fundShortName;
+
+    private Integer riskLevel;
+
+    private String trustId;
+
+    private BigDecimal netNav;
+
+    private BigDecimal cumulativeNav;
+
+    private Date endDate;
+
+    private Date priceDate;
+
+    private Integer strategy;
+
+    private Integer substrategy;
+
+    private BigDecimal ret1w;
+
+    private BigDecimal ret1m;
+
+    private BigDecimal ret6m;
+
+    private BigDecimal ret1y;
+
+    private BigDecimal retIncep;
+
+    private BigDecimal sharperatioIncep;
+
+    private BigDecimal sharperatio1y;
+
+    private BigDecimal sharperatio2y;
+
+    private BigDecimal sharperatio3y;
+
+    private BigDecimal sharperatio4y;
+
+    private BigDecimal sharperatio5y;
+
+    private BigDecimal stddev1y;
+
+    private BigDecimal stddev2y;
+
+    private BigDecimal stddev3y;
+
+    private BigDecimal stddev4y;
+
+    private BigDecimal stddev5y;
+
+    private BigDecimal stddevIncep;
+
+    private BigDecimal maxdrawdown1y;
+
+    private BigDecimal maxdrawdown2y;
+
+    private BigDecimal maxdrawdown3y;
+
+    private BigDecimal maxdrawdown4y;
+
+    private BigDecimal maxdrawdown5y;
+
+    private BigDecimal maxdrawdownIncep;
+}
\ No newline at end of file

src/main/java/com/tanpu/fund/entity/generator/FundInfoPersonnelInfo.java

@@ -6,6 +6,24 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 @Data
 @Builder
 @AllArgsConstructor

src/main/java/com/tanpu/fund/entity/generator/FundInfoPersonnelInfoExample.java

@@ -5,6 +5,24 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 public class FundInfoPersonnelInfoExample {
     protected String orderByClause;
 

src/main/java/com/tanpu/fund/entity/generator/FundInfoView.java

@@ -7,6 +7,24 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 @Data
 @Builder
 @AllArgsConstructor

src/main/java/com/tanpu/fund/entity/generator/FundInfoViewExample.java

@@ -6,6 +6,24 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 public class FundInfoViewExample {
     protected String orderByClause;
 

src/main/java/com/tanpu/fund/entity/generator/FundManagerMapping.java

@@ -6,6 +6,25 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
+
 /**
  * 基金与基金经理关联
  */

src/main/java/com/tanpu/fund/entity/generator/FundManagerMapping1.java

@@ -6,6 +6,25 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
+
 /**
  * 基金与基金经理关联
  */
@@ -50,4 +69,9 @@ public class FundManagerMapping1 {
     private Date updateTime;
 
     private Integer deleteTag;
+
+    /**
+     * 机构id
+     */
+    private String orgId;
 }
\ No newline at end of file

src/main/java/com/tanpu/fund/entity/generator/FundManagerMapping1Example.java

@@ -5,6 +5,24 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 public class FundManagerMapping1Example {
     protected String orderByClause;
 
@@ -841,6 +859,76 @@ public class FundManagerMapping1Example {
             addCriterion("delete_tag not between", value1, value2, "deleteTag");
             return (Criteria) this;
         }
+
+        public Criteria andOrgIdIsNull() {
+            addCriterion("org_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNotNull() {
+            addCriterion("org_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdEqualTo(String value) {
+            addCriterion("org_id =", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotEqualTo(String value) {
+            addCriterion("org_id <>", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThan(String value) {
+            addCriterion("org_id >", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThanOrEqualTo(String value) {
+            addCriterion("org_id >=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThan(String value) {
+            addCriterion("org_id <", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThanOrEqualTo(String value) {
+            addCriterion("org_id <=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLike(String value) {
+            addCriterion("org_id like", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotLike(String value) {
+            addCriterion("org_id not like", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIn(List<String> values) {
+            addCriterion("org_id in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotIn(List<String> values) {
+            addCriterion("org_id not in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdBetween(String value1, String value2) {
+            addCriterion("org_id between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotBetween(String value1, String value2) {
+            addCriterion("org_id not between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

src/main/java/com/tanpu/fund/entity/generator/FundManagerMappingExample.java

@@ -5,6 +5,24 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 public class FundManagerMappingExample {
     protected String orderByClause;
 

src/main/java/com/tanpu/fund/entity/generator/FundMarketIndexes.java

@@ -7,6 +7,25 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
+
 /**
  * 指数
  */

src/main/java/com/tanpu/fund/entity/generator/FundMarketIndexesExample.java

@@ -6,6 +6,24 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 public class FundMarketIndexesExample {
     protected String orderByClause;
 

src/main/java/com/tanpu/fund/entity/generator/FundNav.java

@@ -7,6 +7,25 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
+
 /**
  * 基金净值
  */
@@ -61,4 +80,9 @@ public class FundNav {
     private Date updateTime;
 
     private Integer deleteTag;
+
+    /**
+     * 前一日单位净值
+     */
+    private BigDecimal preNav;
 }
\ No newline at end of file

src/main/java/com/tanpu/fund/entity/generator/FundNavExample.java

@@ -6,6 +6,24 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 public class FundNavExample {
     protected String orderByClause;
 
@@ -952,6 +970,66 @@ public class FundNavExample {
             addCriterion("delete_tag not between", value1, value2, "deleteTag");
             return (Criteria) this;
         }
+
+        public Criteria andPreNavIsNull() {
+            addCriterion("pre_nav is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreNavIsNotNull() {
+            addCriterion("pre_nav is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreNavEqualTo(BigDecimal value) {
+            addCriterion("pre_nav =", value, "preNav");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreNavNotEqualTo(BigDecimal value) {
+            addCriterion("pre_nav <>", value, "preNav");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreNavGreaterThan(BigDecimal value) {
+            addCriterion("pre_nav >", value, "preNav");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreNavGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("pre_nav >=", value, "preNav");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreNavLessThan(BigDecimal value) {
+            addCriterion("pre_nav <", value, "preNav");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreNavLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("pre_nav <=", value, "preNav");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreNavIn(List<BigDecimal> values) {
+            addCriterion("pre_nav in", values, "preNav");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreNavNotIn(List<BigDecimal> values) {
+            addCriterion("pre_nav not in", values, "preNav");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreNavBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("pre_nav between", value1, value2, "preNav");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreNavNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("pre_nav not between", value1, value2, "preNav");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

src/main/java/com/tanpu/fund/entity/generator/FundPersonnelInfo.java

@@ -6,6 +6,24 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 @Data
 @Builder
 @AllArgsConstructor
@@ -55,6 +73,11 @@ public class FundPersonnelInfo {
 
     private String getQualify;
 
+    /**
+     * 机构id
+     */
+    private String orgId;
+
     private String avatar;
 
     private String profile;

src/main/java/com/tanpu/fund/entity/generator/FundPersonnelInfoExample.java

@@ -5,6 +5,24 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 public class FundPersonnelInfoExample {
     protected String orderByClause;
 
@@ -1551,6 +1569,76 @@ public class FundPersonnelInfoExample {
             addCriterion("get_qualify not between", value1, value2, "getQualify");
             return (Criteria) this;
         }
+
+        public Criteria andOrgIdIsNull() {
+            addCriterion("org_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNotNull() {
+            addCriterion("org_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdEqualTo(String value) {
+            addCriterion("org_id =", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotEqualTo(String value) {
+            addCriterion("org_id <>", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThan(String value) {
+            addCriterion("org_id >", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThanOrEqualTo(String value) {
+            addCriterion("org_id >=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThan(String value) {
+            addCriterion("org_id <", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThanOrEqualTo(String value) {
+            addCriterion("org_id <=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLike(String value) {
+            addCriterion("org_id like", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotLike(String value) {
+            addCriterion("org_id not like", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIn(List<String> values) {
+            addCriterion("org_id in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotIn(List<String> values) {
+            addCriterion("org_id not in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdBetween(String value1, String value2) {
+            addCriterion("org_id between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotBetween(String value1, String value2) {
+            addCriterion("org_id not between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

src/main/java/com/tanpu/fund/entity/generator/FundRateMapping.java

@@ -7,6 +7,25 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
+
 /**
  * 基金费率
  */

src/main/java/com/tanpu/fund/entity/generator/FundRateMappingExample.java

@@ -5,6 +5,24 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 public class FundRateMappingExample {
     protected String orderByClause;
 

src/main/java/com/tanpu/fund/entity/generator/FundRiskStats.java

@@ -7,6 +7,25 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
+
 /**
  * 基金风险指标
  */

src/main/java/com/tanpu/fund/entity/generator/FundRiskStatsExample.java

@@ -6,6 +6,24 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 public class FundRiskStatsExample {
     protected String orderByClause;
 

src/main/java/com/tanpu/fund/entity/generator/IfaImportedFundCount.java

@@ -7,6 +7,25 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
+
 /**
  * 基金历史业绩
  */
@@ -352,4 +371,9 @@ public class IfaImportedFundCount {
     private Integer sort;
 
     private Integer deleteTag;
+
+    /**
+     * 机构id
+     */
+    private String orgId;
 }
\ No newline at end of file

src/main/java/com/tanpu/fund/entity/generator/IfaImportedFundCountExample.java

@@ -6,6 +6,24 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 public class IfaImportedFundCountExample {
     protected String orderByClause;
 
@@ -4352,6 +4370,76 @@ public class IfaImportedFundCountExample {
             addCriterion("delete_tag not between", value1, value2, "deleteTag");
             return (Criteria) this;
         }
+
+        public Criteria andOrgIdIsNull() {
+            addCriterion("org_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNotNull() {
+            addCriterion("org_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdEqualTo(String value) {
+            addCriterion("org_id =", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotEqualTo(String value) {
+            addCriterion("org_id <>", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThan(String value) {
+            addCriterion("org_id >", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThanOrEqualTo(String value) {
+            addCriterion("org_id >=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThan(String value) {
+            addCriterion("org_id <", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThanOrEqualTo(String value) {
+            addCriterion("org_id <=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLike(String value) {
+            addCriterion("org_id like", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotLike(String value) {
+            addCriterion("org_id not like", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIn(List<String> values) {
+            addCriterion("org_id in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotIn(List<String> values) {
+            addCriterion("org_id not in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdBetween(String value1, String value2) {
+            addCriterion("org_id between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotBetween(String value1, String value2) {
+            addCriterion("org_id not between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

src/main/java/com/tanpu/fund/entity/generator/IfaImportedFundInfo.java

@@ -7,6 +7,24 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 @Data
 @Builder
 @AllArgsConstructor
@@ -96,6 +114,8 @@ public class IfaImportedFundInfo {
      */
     private String ifaId;
 
+    private Integer hasNav;
+
     private Date createTime;
 
     private String createBy;
@@ -105,4 +125,14 @@ public class IfaImportedFundInfo {
     private String updateBy;
 
     private Integer deleteTag;
+
+    /**
+     * 净值更新周期
+     */
+    private Integer navFrequency;
+
+    /**
+     * 机构id
+     */
+    private String orgId;
 }
\ No newline at end of file

src/main/java/com/tanpu/fund/entity/generator/IfaImportedFundInfoExample.java

@@ -5,6 +5,24 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 public class IfaImportedFundInfoExample {
     protected String orderByClause;
 
@@ -1276,6 +1294,66 @@ public class IfaImportedFundInfoExample {
             return (Criteria) this;
         }
 
+        public Criteria andHasNavIsNull() {
+            addCriterion("has_nav is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasNavIsNotNull() {
+            addCriterion("has_nav is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasNavEqualTo(Integer value) {
+            addCriterion("has_nav =", value, "hasNav");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasNavNotEqualTo(Integer value) {
+            addCriterion("has_nav <>", value, "hasNav");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasNavGreaterThan(Integer value) {
+            addCriterion("has_nav >", value, "hasNav");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasNavGreaterThanOrEqualTo(Integer value) {
+            addCriterion("has_nav >=", value, "hasNav");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasNavLessThan(Integer value) {
+            addCriterion("has_nav <", value, "hasNav");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasNavLessThanOrEqualTo(Integer value) {
+            addCriterion("has_nav <=", value, "hasNav");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasNavIn(List<Integer> values) {
+            addCriterion("has_nav in", values, "hasNav");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasNavNotIn(List<Integer> values) {
+            addCriterion("has_nav not in", values, "hasNav");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasNavBetween(Integer value1, Integer value2) {
+            addCriterion("has_nav between", value1, value2, "hasNav");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasNavNotBetween(Integer value1, Integer value2) {
+            addCriterion("has_nav not between", value1, value2, "hasNav");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;
@@ -1595,6 +1673,136 @@ public class IfaImportedFundInfoExample {
             addCriterion("delete_tag not between", value1, value2, "deleteTag");
             return (Criteria) this;
         }
+
+        public Criteria andNavFrequencyIsNull() {
+            addCriterion("nav_frequency is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNavFrequencyIsNotNull() {
+            addCriterion("nav_frequency is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNavFrequencyEqualTo(Integer value) {
+            addCriterion("nav_frequency =", value, "navFrequency");
+            return (Criteria) this;
+        }
+
+        public Criteria andNavFrequencyNotEqualTo(Integer value) {
+            addCriterion("nav_frequency <>", value, "navFrequency");
+            return (Criteria) this;
+        }
+
+        public Criteria andNavFrequencyGreaterThan(Integer value) {
+            addCriterion("nav_frequency >", value, "navFrequency");
+            return (Criteria) this;
+        }
+
+        public Criteria andNavFrequencyGreaterThanOrEqualTo(Integer value) {
+            addCriterion("nav_frequency >=", value, "navFrequency");
+            return (Criteria) this;
+        }
+
+        public Criteria andNavFrequencyLessThan(Integer value) {
+            addCriterion("nav_frequency <", value, "navFrequency");
+            return (Criteria) this;
+        }
+
+        public Criteria andNavFrequencyLessThanOrEqualTo(Integer value) {
+            addCriterion("nav_frequency <=", value, "navFrequency");
+            return (Criteria) this;
+        }
+
+        public Criteria andNavFrequencyIn(List<Integer> values) {
+            addCriterion("nav_frequency in", values, "navFrequency");
+            return (Criteria) this;
+        }
+
+        public Criteria andNavFrequencyNotIn(List<Integer> values) {
+            addCriterion("nav_frequency not in", values, "navFrequency");
+            return (Criteria) this;
+        }
+
+        public Criteria andNavFrequencyBetween(Integer value1, Integer value2) {
+            addCriterion("nav_frequency between", value1, value2, "navFrequency");
+            return (Criteria) this;
+        }
+
+        public Criteria andNavFrequencyNotBetween(Integer value1, Integer value2) {
+            addCriterion("nav_frequency not between", value1, value2, "navFrequency");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNull() {
+            addCriterion("org_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNotNull() {
+            addCriterion("org_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdEqualTo(String value) {
+            addCriterion("org_id =", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotEqualTo(String value) {
+            addCriterion("org_id <>", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThan(String value) {
+            addCriterion("org_id >", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThanOrEqualTo(String value) {
+            addCriterion("org_id >=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThan(String value) {
+            addCriterion("org_id <", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThanOrEqualTo(String value) {
+            addCriterion("org_id <=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLike(String value) {
+            addCriterion("org_id like", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotLike(String value) {
+            addCriterion("org_id not like", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIn(List<String> values) {
+            addCriterion("org_id in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotIn(List<String> values) {
+            addCriterion("org_id not in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdBetween(String value1, String value2) {
+            addCriterion("org_id between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotBetween(String value1, String value2) {
+            addCriterion("org_id not between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

src/main/java/com/tanpu/fund/entity/generator/IfaImportedFundInfoView.java

@@ -7,6 +7,24 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 @Data
 @Builder
 @AllArgsConstructor
@@ -18,6 +36,8 @@ public class IfaImportedFundInfoView {
 
     private String fundName;
 
+    private String fundShortName;
+
     private String companyName;
 
     private Integer substrategy;
@@ -64,10 +84,14 @@ public class IfaImportedFundInfoView {
 
     private BigDecimal ret1m;
 
+    private BigDecimal ret3m;
+
     private BigDecimal ret6m;
 
     private BigDecimal ret1y;
 
+    private BigDecimal retYtd;
+
     private BigDecimal retIncep;
 
     private BigDecimal sharperatioIncep;

src/main/java/com/tanpu/fund/entity/generator/IfaImportedFundInfoView12.java

+package com.tanpu.fund.entity.generator;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class IfaImportedFundInfoView12 {
+    private String id;
+
+    private Integer type;
+
+    private String fundName;
+
+    private String fundShortName;
+
+    private String companyName;
+
+    private Integer substrategy;
+
+    private Integer strategy;
+
+    private String manageName;
+
+    private String riskLevel;
+
+    private Date inceptionDate;
+
+    private String registerNumber;
+
+    private String openDay;
+
+    private BigDecimal minInvestmentShare;
+
+    private BigDecimal subsequentInvestmentShare;
+
+    private BigDecimal subscriptionFee;
+
+    private BigDecimal redemptionFee;
+
+    private BigDecimal managementFee;
+
+    private BigDecimal performanceFee;
+
+    private String performanceCalculateMethod;
+
+    private String ifaId;
+
+    private Integer deleteTag;
+
+    private Date createTime;
+
+    private Date priceDate;
+
+    private BigDecimal netNav;
+
+    private BigDecimal cumulativeNav;
+
+    private BigDecimal ret1w;
+
+    private BigDecimal ret1m;
+
+    private BigDecimal ret6m;
+
+    private BigDecimal ret1y;
+
+    private BigDecimal retIncep;
+
+    private BigDecimal sharperatioIncep;
+
+    private BigDecimal sharperatio1y;
+
+    private BigDecimal sharperatio2y;
+
+    private BigDecimal sharperatio3y;
+
+    private BigDecimal sharperatio4y;
+
+    private BigDecimal sharperatio5y;
+
+    private BigDecimal stddev1y;
+
+    private BigDecimal stddev2y;
+
+    private BigDecimal stddev3y;
+
+    private BigDecimal stddev4y;
+
+    private BigDecimal stddev5y;
+
+    private BigDecimal stddevIncep;
+
+    private BigDecimal maxdrawdown1y;
+
+    private BigDecimal maxdrawdown2y;
+
+    private BigDecimal maxdrawdown3y;
+
+    private BigDecimal maxdrawdown4y;
+
+    private BigDecimal maxdrawdown5y;
+
+    private BigDecimal maxdrawdownIncep;
+
+    private Double zScore;
+}
\ No newline at end of file

src/main/java/com/tanpu/fund/entity/generator/IfaImportedFundInfoView2.java

+package com.tanpu.fund.entity.generator;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class IfaImportedFundInfoView2 {
+    private String id;
+
+    private Integer type;
+
+    private String fundName;
+
+    private String companyName;
+
+    private Integer substrategy;
+
+    private Integer strategy;
+
+    private String manageName;
+
+    private String riskLevel;
+
+    private Date inceptionDate;
+
+    private String registerNumber;
+
+    private String openDay;
+
+    private BigDecimal minInvestmentShare;
+
+    private BigDecimal subsequentInvestmentShare;
+
+    private BigDecimal subscriptionFee;
+
+    private BigDecimal redemptionFee;
+
+    private BigDecimal managementFee;
+
+    private BigDecimal performanceFee;
+
+    private String performanceCalculateMethod;
+
+    private String ifaId;
+
+    private Integer deleteTag;
+
+    private Date createTime;
+
+    private Date priceDate;
+
+    private BigDecimal netNav;
+
+    private BigDecimal cumulativeNav;
+
+    private BigDecimal ret1w;
+
+    private BigDecimal ret1m;
+
+    private BigDecimal ret6m;
+
+    private BigDecimal ret1y;
+
+    private BigDecimal retIncep;
+
+    private BigDecimal sharperatioIncep;
+
+    private BigDecimal sharperatio1y;
+
+    private BigDecimal sharperatio2y;
+
+    private BigDecimal sharperatio3y;
+
+    private BigDecimal sharperatio4y;
+
+    private BigDecimal sharperatio5y;
+
+    private BigDecimal stddev1y;
+
+    private BigDecimal stddev2y;
+
+    private BigDecimal stddev3y;
+
+    private BigDecimal stddev4y;
+
+    private BigDecimal stddev5y;
+
+    private BigDecimal stddevIncep;
+
+    private BigDecimal maxdrawdown1y;
+
+    private BigDecimal maxdrawdown2y;
+
+    private BigDecimal maxdrawdown3y;
+
+    private BigDecimal maxdrawdown4y;
+
+    private BigDecimal maxdrawdown5y;
+
+    private BigDecimal maxdrawdownIncep;
+
+    private Double zScore;
+}
\ No newline at end of file

src/main/java/com/tanpu/fund/entity/generator/IfaImportedFundInfoViewOld.java

@@ -7,6 +7,24 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 @Data
 @Builder
 @AllArgsConstructor

src/main/java/com/tanpu/fund/entity/generator/IfaImportedFundInfoViewOldExample.java

@@ -6,6 +6,24 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 public class IfaImportedFundInfoViewOldExample {
     protected String orderByClause;
 

src/main/java/com/tanpu/fund/entity/generator/IfaImportedFundNav.java

@@ -7,6 +7,24 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+/**
+ * @author: zhoupeng
+ * <p>
+ * =========================================
+ * =========================================
+ * ========                         ========
+ * =======   ==========   =======    =======
+ * ======        =====    ==   ====   ======
+ * =====        =====     ==    ===    =====
+ * =====       =====      ==   ===     =====
+ * =====      =====       == ===       =====
+ * ======    ==========   ==          ======
+ * =======                           =======
+ * =========================================
+ * =========================================
+ * <p>
+ * @email: zhoupeng_08@163.com
+ */
 @Data
 @Builder
 @AllArgsConstructor
@@ -35,4 +53,9 @@ public class IfaImportedFundNav {
     private BigDecimal cumulativeNav;
 
     private Integer deleteTag;
+
+    /**
+     * 机构id
+     */
+    private String orgId;
 }
\ No newline at end of file