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

张志伟
2 parents 1cc23239 137d53b4
Showing 6 changed files with 24 additions and 0 deletions
doc/v1.1.4_alpha/sql.sql
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/customer/CustomerBaseInfo.java
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/CustomerChangeDto.java
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/CustomerDetailDto.java
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/vo/customer/CustomerChangeInfoVO.java
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/vo/customer/OwnerVO.java
+alter table customer_base_info
+    add ` job` varchar(32) null comment '职业' after hobby;
+
+
 create table public_clue_pool
 (
     id bigint auto_increment,
@@ -50,6 +50,10 @@ public class CustomerBaseInfo extends BaseAuditableTimeEntity&lt;CustomerBaseInfo, 
      */
     private String hobby;
     /**
+     * 职业
+     */
+    private String job;
+    /**
      * 客户类型 1:个人；2:单位
      */
     private CusTypeEnum cusType;
@@ -52,6 +52,10 @@ public class CustomerChangeDto {
      */
     private String hobby;
     /**
+     * 职业
+     */
+    private String job;
+    /**
      * 工作单位;个人
      */
     private String companyName;
@@ -126,6 +126,10 @@ public class CustomerDetailDto {
      */
     private String hobby;
     /**
+     * 职业
+     */
+    private String job;
+    /**
      * 号码归属地
      */
     private String region;
@@ -48,6 +48,10 @@ public class CustomerChangeInfoVO {
      */
     private String hobby;
     /**
+     * 职业
+     */
+    private String job;
+    /**
      * 工作单位;个人
      */
     private String companyName;
@@ -63,6 +63,10 @@ public class OwnerVO {
      */
     private String address;
     /**
+     * 职业
+     */
+    private String job;
+    /**
      * 纬度
      */
     private BigDecimal lat;