Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dq-framework-model/src/main/java/com/daqing/framework/domain/crms/request/CustomerRequest.java

dq-framework-model/src/main/java/com/daqing/framework/domain/crms/CustomerEntity.java

@@ -29,7 +29,7 @@ public class CustomerEntity implements Serializable {
 	 */
 	private String code;
 	/**
-	 * 客户类型
+	 * 客户类型：1、企业类型，0：个人类型
 	 */
 	private Integer type;
 	/**

dq-framework-model/src/main/java/com/daqing/framework/domain/crms/ext/CrmsConstant.java

@@ -0,0 +1,43 @@
+package com.daqing.framework.domain.crms.ext;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Author: gongsj.
+ * @Description: 定义客户资源管理系统的一些常量
+ * @Date:Created in 2020/09/08 17:05.
+ * @Modified By:
+ */
+public class CrmsConstant {
+
+    /**
+     * 客户类型：1、企业类型，0：个人类型
+     */
+    @AllArgsConstructor
+    public enum customerType {
+        /**
+         * 个人类型
+         */
+        PONSONAL_CUSTOMER(0, "个人类型"),
+        /**
+         * 企业类型
+         */
+        COMPANY_CUSTOMER(1, "企业类型");
+
+        /**
+         * 类型代号
+         */
+        @Setter
+        @Getter
+        private Integer type;
+
+        /**
+         * 类型名称
+         */
+        @Setter
+        @Getter
+        private String typeName;
+    }
+}

dq-framework-model/src/main/java/com/daqing/framework/domain/crms/request/CustomerRequest.java

@@ -1,5 +1,11 @@
 package com.daqing.framework.domain.crms.request;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
 import lombok.Data;
 import lombok.ToString;