Merge branch 'dev_upgrade_mybatis_plus' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/crm/CustomerEntity.java

@@ -17,9 +17,10 @@
 
 package com.epmet.entity.crm;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -39,6 +40,11 @@ public class CustomerEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * id
+	 */
+	@TableId(type = IdType.ASSIGN_UUID)
+	private String id;
     /**
      * 客户名称
      */

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerEntity.java

@@ -17,8 +17,9 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -38,6 +39,12 @@ public class CustomerEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * id
+	 */
+	@TableId(type = IdType.ASSIGN_UUID)
+	private String id;
+
     /**
      * 客户名称
      */