Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralDetail.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fuint.repository.model.base.BaseEntity;
 import lombok.Data;
 
@@ -18,6 +19,7 @@ public class IntegralDetail extends BaseEntity implements Serializable {
     /**
      * 积分明细ID
      */
+    @TableId(value = "id" )
     private Integer id;
     /**
      * 用户ID，表示积分变动的用户