TASK:代码合并;

src/main/java/com/ai/da/mapper/primary/OrderInfoMapper.java

@@ -1,6 +1,6 @@
-package com.ai.da.mapper;
+package com.ai.da.mapper.primary;
 
-import com.ai.da.mapper.entity.OrderInfo;
+import com.ai.da.mapper.primary.entity.OrderInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 public interface OrderInfoMapper extends BaseMapper<OrderInfo> {

src/main/java/com/ai/da/mapper/primary/PaymentInfoMapper.java

@@ -1,6 +1,6 @@
-package com.ai.da.mapper;
+package com.ai.da.mapper.primary;
 
-import com.ai.da.mapper.entity.PaymentInfo;
+import com.ai.da.mapper.primary.entity.PaymentInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 public interface PaymentInfoMapper extends BaseMapper<PaymentInfo> {

src/main/java/com/ai/da/mapper/primary/ProductMapper.java

@@ -1,6 +1,6 @@
-package com.ai.da.mapper;
+package com.ai.da.mapper.primary;
 
-import com.ai.da.mapper.entity.Product;
+import com.ai.da.mapper.primary.entity.Product;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 public interface ProductMapper extends BaseMapper<Product> {

src/main/java/com/ai/da/mapper/primary/RefundInfoMapper.java

@@ -1,7 +1,7 @@
-package com.ai.da.mapper;
+package com.ai.da.mapper.primary;
 
 
-import com.ai.da.mapper.entity.RefundInfo;
+import com.ai.da.mapper.primary.entity.RefundInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 public interface RefundInfoMapper extends BaseMapper<RefundInfo> {

src/main/java/com/ai/da/mapper/primary/entity/BaseEntity.java

@@ -2,10 +2,8 @@ package com.ai.da.mapper.primary.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -19,6 +17,7 @@ public class BaseEntity implements Serializable {
     /**
      * ID
      */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**

src/main/java/com/ai/da/mapper/primary/entity/OrderInfo.java

@@ -1,4 +1,4 @@
-package com.ai.da.mapper.entity;
+package com.ai.da.mapper.primary.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

src/main/java/com/ai/da/mapper/primary/entity/PaymentInfo.java

@@ -1,4 +1,4 @@
-package com.ai.da.mapper.entity;
+package com.ai.da.mapper.primary.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

src/main/java/com/ai/da/mapper/primary/entity/Product.java

@@ -1,4 +1,4 @@
-package com.ai.da.mapper.entity;
+package com.ai.da.mapper.primary.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

src/main/java/com/ai/da/mapper/primary/entity/RefundInfo.java

@@ -1,4 +1,4 @@
-package com.ai.da.mapper.entity;
+package com.ai.da.mapper.primary.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;