Merge remote-tracking branch 'origin/main'

ebike-common/src/main/java/com/cdzy/common/enums/EbikeContents.java

@@ -8,4 +8,6 @@ public interface EbikeContents {
 
     String TENANT_ID = "operator_id";
 
+    String LOGIC_DELETE  = "is_deleted";
+
 }

ebike-operations/src/main/java/com/cdzy/operations/config/MyBatisFlexConfiguration.java

@@ -42,6 +42,9 @@ public class MyBatisFlexConfiguration {
         keyConfig.setBefore(true);
 
         globalConfig.setTenantColumn(EbikeContents.TENANT_ID);
+
+        globalConfig.setLogicDeleteColumn(EbikeContents.LOGIC_DELETE);
+
         globalConfig.setKeyConfig(keyConfig);
         //方言配置
         globalConfig.setDbType(DbType.POSTGRE_SQL); // 关键配置

ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBatteryInfo.java

@@ -62,7 +62,6 @@ public class EbikeBatteryInfo implements Serializable {
     /**
      * 删除状态（true表示已删除）
      */
-    @Column(isLogicDelete = true)
     private Boolean isDeleted;
 
     /**

ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBikeInfo.java

@@ -130,7 +130,6 @@ public class EbikeBikeInfo implements Serializable {
     /**
      * 删除与否
      */
-    @Column(isLogicDelete = true)
     private Boolean isDeleted;
 
 }

ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeBikeQr.java

@@ -66,7 +66,7 @@ public class EbikeBikeQr implements Serializable {
      */
     private Integer status;
 
-    @Column(isLogicDelete = true)
+
     private Boolean isDeleted;
 
 }

ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeEcuInfo.java

@@ -59,7 +59,6 @@ public class EbikeEcuInfo implements Serializable {
     /**
      * 删除状态
      */
-    @Column(isLogicDelete = true)
     private Boolean isDeleted;
 
     /**

ebike-staff/src/main/java/com/cdzy/staff/config/MyBatisFlexConfiguration.java

@@ -42,6 +42,9 @@ public class MyBatisFlexConfiguration {
         keyConfig.setBefore(true);
 
         globalConfig.setTenantColumn(EbikeContents.TENANT_ID);
+
+        globalConfig.setLogicDeleteColumn(EbikeContents.LOGIC_DELETE);
+
         globalConfig.setKeyConfig(keyConfig);
         //方言配置
         globalConfig.setDbType(DbType.POSTGRE_SQL); // 关键配置

ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeDic.java

@@ -56,7 +56,6 @@ public class EbikeDic implements Serializable {
     @Column(onUpdateValue = "now()")
     private LocalDateTime updateTime;
 
-    @Column(isLogicDelete = true)
     private Boolean isDeleted;
 
     @RelationOneToMany(selfField = "dicId",targetField = "dicId")

ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeOperator.java

@@ -59,7 +59,6 @@ public class EbikeOperator implements Serializable {
     @Column(onUpdateValue = "now()")
     private LocalDateTime updateTime;
 
-    @Column(isLogicDelete = true)
     private Boolean isDeleted;
 
 }

ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeOperatorStaff.java

@@ -57,7 +57,6 @@ public class EbikeOperatorStaff implements Serializable {
     @Column(onUpdateValue = "now()")
     private LocalDateTime updateTime;
 
-    @Column(isLogicDelete = true)
     private Boolean isDeleted;
 
     private String contactPhone;

ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikePermission.java

@@ -58,7 +58,6 @@ public class EbikePermission implements Serializable {
     @Column(onUpdateValue = "now()")
     private LocalDateTime updateTime;
 
-    @Column(isLogicDelete = true)
     private Boolean isDeleted;
 
     /**

ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeRolePermission.java

@@ -2,7 +2,6 @@ package com.cdzy.staff.model.entity;
 
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
-import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -46,7 +45,6 @@ public class EbikeRolePermission implements Serializable {
     @Column(onUpdateValue = "now()")
     private LocalDateTime updateTime;
 
-    @Column(isLogicDelete = true)
     private Boolean isDeleted;
 
     private Boolean isEmpower;

ebike-staff/src/main/java/com/cdzy/staff/model/entity/EbikeStaffRole.java

@@ -2,7 +2,6 @@ package com.cdzy.staff.model.entity;
 
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
-import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -46,7 +45,6 @@ public class EbikeStaffRole implements Serializable {
     @Column(onUpdateValue = "now()")
     private LocalDateTime updateTime;
 
-    @Column(isLogicDelete = true)
     private Boolean isDeleted;
 
 }

ebike-user/src/main/java/com/cdzy/user/config/MyBatisFlexConfiguration.java

@@ -42,6 +42,9 @@ public class MyBatisFlexConfiguration {
         keyConfig.setBefore(true);
 
         globalConfig.setTenantColumn(EbikeContents.TENANT_ID);
+
+        globalConfig.setLogicDeleteColumn(EbikeContents.LOGIC_DELETE);
+
         globalConfig.setKeyConfig(keyConfig);
         //方言配置
         globalConfig.setDbType(DbType.POSTGRE_SQL); // 关键配置

ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeOrderTransaction.java

@@ -16,8 +16,8 @@ import java.time.LocalDateTime;
 /**
  * 用户订单表实体类
  *
- * @Author: yanglei
+ * @author : yanglei
- * @Since: 2025-10-15  15:11
+ * @since : 2025-10-15  15:11
  */
 
 @Data

ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeUser.java

@@ -15,8 +15,8 @@ import java.time.LocalDateTime;
 /**
  * 用户基本信息实体类
  *
- * @Author: yanglei
+ * @author : yanglei
- * @Since: 2025-10-15  09:21
+ * @since : 2025-10-15  09:21
  */
 
 @Data

ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeUserRealInfo.java

@@ -15,8 +15,8 @@ import java.time.LocalDateTime;
 /**
  * 实名认证信息 实体类
  *
- * @Author: yanglei
+ * @author : yanglei
- * @Since: 2025-10-15  09:49
+ * @since : 2025-10-15  09:49
  */
 
 @Data